commit 00d2c8dff57d8e5eb0f7989d595c11f666bf1e10
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Mar 07 14:46:59 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Mar 07 14:46:59 2023 +0000
tree 5d23e0e21a3f000dd0072d4ff6417d83c06df5c5
parent 1efbc8b997194034286a79fbf8338a4440b1a176
parent c6639b24e604d57b25e90166c437228cbc8f8e4c

Snap for 9701827 from c6639b24e604d57b25e90166c437228cbc8f8e4c to mainline-documentsui-release

Change-Id: I23dd06709885130d1dd4b06ab3bf4c400a7e0091

transport/ServiceManagement.cpp

diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index c638279..0640eef 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -174,12 +174,15 @@
 }
 
 static inline bool isTrebleTestingOverride() {
+    // return false early so we don't need to check the debuggable property
+    if (!*getTrebleTestingOverridePtr()) return false;
+
     if (kEnforceVintfManifest && !isDebuggable()) {
         // don't allow testing override in production
         return false;
     }
 
-    return *getTrebleTestingOverridePtr();
+    return true;
 }
 
 static void onRegistrationImpl(const std::string& descriptor, const std::string& instanceName) {