commit 9e496b52a58adcb5a786e69bab13fce011fd0a36
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 22 00:34:17 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 22 00:34:17 2022 +0000
tree 5d23e0e21a3f000dd0072d4ff6417d83c06df5c5
parent 7e63cb8013183debbe434b2395b8fb201bfdd28c
parent 3b6a233eba04571ea6178d0c49e126b099de1b30

Snap for 9316743 from 3b6a233eba04571ea6178d0c49e126b099de1b30 to tm-qpr2-release

Change-Id: I5fe809f7c77a0d06e278338e586c79bfd3af4c27

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