commit 373cde34e4c8d2a44fe27fd24317d64c360779eb
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Feb 22 18:42:59 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Feb 22 18:42:59 2023 +0000
tree 5d23e0e21a3f000dd0072d4ff6417d83c06df5c5
parent c262c2604481418b17cf03efee7ef041f34348d7
parent 508a302306363774d51639828ad23a732a68f70b

Snap for 9635940 from 508a302306363774d51639828ad23a732a68f70b to tm-platform-release

Change-Id: I2342f52ef85da0900339643452a6fcae169333fb

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) {