commit f3166e46ed71396cd876c1baae3d3c5a35f005bc
author Peiyong Lin <lpy@google.com> Thu Feb 29 02:00:03 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 29 02:00:03 2024 +0000
tree e33a54ec5ee5b9bd65720bea0988b58a5e15d730
parent 0829ececc9bcf35edcf48d158647af024a83dca2
parent f5da7eecd6d85ba8e7a5d83f9f4b178561e24daf

Merge "Set linker namespaces to null if VNDK namespace is not available" into main

libs/graphicsenv/GraphicsEnv.cpp

diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp
index 394a000..50c05f4 100644
--- a/libs/graphicsenv/GraphicsEnv.cpp
+++ b/libs/graphicsenv/GraphicsEnv.cpp
@@ -265,7 +265,8 @@
 
     auto vndkNamespace = android_get_exported_namespace("vndk");
     if (!vndkNamespace) {
-        return nullptr;
+        mDriverNamespace = nullptr;
+        return mDriverNamespace;
     }
 
     mDriverNamespace = android_create_namespace("updatable gfx driver",
@@ -617,7 +618,8 @@
 
     auto vndkNamespace = android_get_exported_namespace("vndk");
     if (!vndkNamespace) {
-        return nullptr;
+        mAngleNamespace = nullptr;
+        return mAngleNamespace;
     }
 
     if (!linkDriverNamespaceLocked(mAngleNamespace, vndkNamespace, "")) {