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

Commit 222b4e86 authored by Peiyong Lin's avatar Peiyong Lin Committed by Automerger Merge Worker
Browse files

Merge "Revert "Do not allow wildcard matching in GL loader."" into udc-qpr-dev am: b6fe8a66 

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



Change-Id: I69b7a71cfa005962e9e1007b9370af132bd2541a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8dc9335 b6fe8a66

opengl/libs/EGL/Loader.cpp

+1 −5
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 


#include <android-base/properties.h>

#include <android/dlext.h>

#include <cutils/properties.h>

#include <dirent.h>

#include <dlfcn.h>

#include <graphicsenv/GraphicsEnv.h>
@@ -262,10 +261,7 @@ void* Loader::open(egl_connection_t* cnx) 
        hnd = attempt_to_load_system_driver(cnx, nullptr, true);

    }



    if (!hnd && !failToLoadFromDriverSuffixProperty &&

        property_get_int32("ro.vendor.api_level", 0) < __ANDROID_API_U__) {

        // Still can't find the graphics drivers with the exact name. This time try to use wildcard

        // matching if the device is launched before Android 14.

    if (!hnd && !failToLoadFromDriverSuffixProperty) {

        hnd = attempt_to_load_system_driver(cnx, nullptr, false);

    }