commit 332d156afae77a67f4c8dc8b076a840f749b48de
author Steven Moreland <smoreland@google.com> Mon Jul 13 16:16:22 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 13 16:16:22 2020 +0000
tree e9ea9d4c80f77deba4da5d95aebc914e51fbd732
parent 538af7d4cc54f0ccca52f8abce4a33f19155e0ce
parent 206d2814846d2cbb4ebdb9f38bc1dfa247bc1185

Merge "Remove TREBLE_TESTING_OVERRIDE."

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();
 }
 
 /*