diff options
| author | 2025-01-06 17:00:46 -0800 | |
|---|---|---|
| committer | 2025-01-06 17:00:46 -0800 | |
| commit | 4d1ef19b5b18c60a81e115f5cb81fba77193cf80 (patch) | |
| tree | 252e37b4ca7d1f549a941c739ae0b8702c09cacb /libs/graphicsenv/GraphicsEnv.cpp | |
| parent | a5bbaad8cb105fa87553c50f97659992db52a780 (diff) | |
| parent | 84e9b032d5d3f8203ac31d5f3313499dc91f0955 (diff) | |
Merge "Cleanup GraphicsEnv::setAngleInfo()" into main am: 12d3983ca5 am: 84e9b032d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3436406
Change-Id: Iee2292995c69e9e659c9d4c850a22480a2dda6f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/graphicsenv/GraphicsEnv.cpp')
| -rw-r--r-- | libs/graphicsenv/GraphicsEnv.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp index a8d5fe7371..4874dbde9c 100644 --- a/libs/graphicsenv/GraphicsEnv.cpp +++ b/libs/graphicsenv/GraphicsEnv.cpp @@ -596,7 +596,7 @@ bool GraphicsEnv::shouldUseAngle() { // If path is set to nonempty and shouldUseNativeDriver is true, ANGLE will be used regardless. void GraphicsEnv::setAngleInfo(const std::string& path, const bool shouldUseNativeDriver, const std::string& packageName, - const std::vector<std::string> eglFeatures) { + const std::vector<std::string>& eglFeatures) { if (mShouldUseAngle) { // ANGLE is already set up for this application process, even if the application // needs to switch from apk to system or vice versa, the application process must @@ -606,11 +606,11 @@ void GraphicsEnv::setAngleInfo(const std::string& path, const bool shouldUseNati return; } - mAngleEglFeatures = std::move(eglFeatures); + mAngleEglFeatures = eglFeatures; ALOGV("setting ANGLE path to '%s'", path.c_str()); - mAnglePath = std::move(path); + mAnglePath = path; ALOGV("setting app package name to '%s'", packageName.c_str()); - mPackageName = std::move(packageName); + mPackageName = packageName; if (mAnglePath == "system") { mShouldUseSystemAngle = true; } |