commit da7ca1417c58c4a92a4b3c6597c9a144006a2acb
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Sep 27 16:12:48 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 27 16:12:48 2023 +0000
tree 6e2ff8596d2ddbd4525a576a7b158eddeb8e81d0
parent 553da45cd7f4704f4466bbc113c5ef58a04cbc2c
parent 42407bc5607b1169accb306d301e3899f6925863

Merge "Add additional instance info to log" into main

libs/graphicsenv/GraphicsEnv.cpp

diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp
index 64f8704..701a3b2 100644
--- a/libs/graphicsenv/GraphicsEnv.cpp
+++ b/libs/graphicsenv/GraphicsEnv.cpp
@@ -63,8 +63,7 @@
 namespace {
 static bool isVndkEnabled() {
 #ifdef __BIONIC__
-    // TODO(b/290159430) Use ro.vndk.version to check if VNDK is enabled instead
-    static bool isVndkEnabled = !android::base::GetBoolProperty("ro.vndk.deprecate", false);
+    static bool isVndkEnabled = android::base::GetProperty("ro.vndk.version", "") != "";
     return isVndkEnabled;
 #endif
     return false;