commit 3dc9f283dceb26c37ba7c19b385249a419211ebe
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Feb 01 18:31:01 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Feb 01 18:31:01 2023 +0000
tree 5d23e0e21a3f000dd0072d4ff6417d83c06df5c5
parent 17dc9e9a2862a0d58e21007c4762413be2f7c7f1
parent c6639b24e604d57b25e90166c437228cbc8f8e4c

Snap for 9551394 from c6639b24e604d57b25e90166c437228cbc8f8e4c to mainline-os-statsd-release

Change-Id: Ib646bd6e61f549b8f4d2a29d464c710c183f9e63

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