commit 45ccd13dd68b5be72440cbcadb3c5bbe7f71ba4d
author Rob VanReenen <quic_rvanreen@quicinc.com> Thu Aug 01 12:02:58 2024 -0700
committer Rob VanReenen <quic_rvanreen@quicinc.com> Thu Aug 01 12:26:43 2024 -0700
tree 902aa0e26f0f66c17ab908c8be29bd057badc857
parent 9d04fe2c66aff0fea66657f397827ed334ea3b7d

Fix updatable driver loading issue with EGL.

getDriverNamespace() returns non-NULL if an updatable driver is intended to be used.
Need to throw error only if attempt_to_load_updated_driver() failed.

Bug: 349287141
Change-Id: I4310618c7a031a0c471aea5a6ab00362acff0983

opengl/libs/EGL/Loader.cpp

diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp
index af0bcff..3297fe0 100644
--- a/opengl/libs/EGL/Loader.cpp
+++ b/opengl/libs/EGL/Loader.cpp
@@ -262,7 +262,7 @@
         hnd = attempt_to_load_updated_driver(cnx);
 
         // If updated driver apk is set but fail to load, abort here.
-        LOG_ALWAYS_FATAL_IF(android::GraphicsEnv::getInstance().getDriverNamespace(),
+        LOG_ALWAYS_FATAL_IF(android::GraphicsEnv::getInstance().getDriverNamespace() && !hnd,
                             "couldn't find an OpenGL ES implementation from %s",
                             android::GraphicsEnv::getInstance().getDriverPath().c_str());
     }