diff options
| author | 2024-02-29 02:00:03 +0000 | |
|---|---|---|
| committer | 2024-02-29 02:00:03 +0000 | |
| commit | f3166e46ed71396cd876c1baae3d3c5a35f005bc (patch) | |
| tree | e33a54ec5ee5b9bd65720bea0988b58a5e15d730 /libs/graphicsenv/GraphicsEnv.cpp | |
| parent | 0829ececc9bcf35edcf48d158647af024a83dca2 (diff) | |
| parent | f5da7eecd6d85ba8e7a5d83f9f4b178561e24daf (diff) | |
Merge "Set linker namespaces to null if VNDK namespace is not available" into main
Diffstat (limited to 'libs/graphicsenv/GraphicsEnv.cpp')
| -rw-r--r-- | libs/graphicsenv/GraphicsEnv.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp index 394a0002ed..50c05f4e5b 100644 --- a/libs/graphicsenv/GraphicsEnv.cpp +++ b/libs/graphicsenv/GraphicsEnv.cpp @@ -265,7 +265,8 @@ android_namespace_t* GraphicsEnv::getDriverNamespace() { 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 @@ android_namespace_t* GraphicsEnv::getAngleNamespace() { auto vndkNamespace = android_get_exported_namespace("vndk"); if (!vndkNamespace) { - return nullptr; + mAngleNamespace = nullptr; + return mAngleNamespace; } if (!linkDriverNamespaceLocked(mAngleNamespace, vndkNamespace, "")) { |