Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84e9b032 authored by Tim Van Patten's avatar Tim Van Patten Committed by Automerger Merge Worker
Browse files

Merge "Cleanup GraphicsEnv::setAngleInfo()" into main am: 12d3983c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3436406



Change-Id: I4ef04d8239a867b66e8b3a1c44b6608598a54b50
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 06ed0c9a 12d3983c

libs/graphicsenv/GraphicsEnv.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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;

    }

libs/graphicsenv/include/graphicsenv/GraphicsEnv.h

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public: 
    // If shouldUseNativeDriver is true, it means native GLES drivers must be used for the process.

    // If path is set to nonempty and shouldUseNativeDriver is true, ANGLE will be used regardless.

    void setAngleInfo(const std::string& path, const bool shouldUseNativeDriver,

                      const std::string& packageName, const std::vector<std::string> eglFeatures);

                      const std::string& packageName, const std::vector<std::string>& eglFeatures);

    // Get the ANGLE driver namespace.

    android_namespace_t* getAngleNamespace();

    // Get the app package name.