commit 82b667f835fd3de9e2ccfc506ed9da807ac0f714
author Steven Moreland <smoreland@google.com> Mon Jul 13 17:06:35 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 13 17:06:35 2020 +0000
tree 7ea4d982f06d6596b43b295aaa7219fbf4fe88fd
parent e0ee11c1bdbedd6991708aa7e5b8bed25e862c36
parent fb0c9ce655cf47127e265a6787f56159796ba43a

Merge "Remove TREBLE_TESTING_OVERRIDE." am: 332d156afa am: 8ac15324d8 am: fb0c9ce655

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1358166

Change-Id: I835ffe213e0147b94e6e8d365ea21b77f794ef72

transport/ServiceManagement.cpp

diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index 014958b..1c30909 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -165,10 +165,13 @@
 static constexpr bool kDebuggable = false;
 #endif
 
-static bool gTrebleTestingOverride = false;
+static bool* getTrebleTestingOverridePtr() {
+    static bool gTrebleTestingOverride = false;
+    return &gTrebleTestingOverride;
+}
 
 void setTrebleTestingOverride(bool testingOverride) {
-    gTrebleTestingOverride = testingOverride;
+    *getTrebleTestingOverridePtr() = testingOverride;
 }
 
 static inline bool isTrebleTestingOverride() {
@@ -177,10 +180,7 @@
         return false;
     }
 
-    if (gTrebleTestingOverride) return gTrebleTestingOverride;
-
-    const char* env = std::getenv("TREBLE_TESTING_OVERRIDE");
-    return env && !strcmp(env, "true");
+    return *getTrebleTestingOverridePtr();
 }
 
 /*