summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-03 07:40:51 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-03 07:40:51 +0000
commit0a58212fbbf912790bb98e439caced34d0afe281 (patch)
tree5d23e0e21a3f000dd0072d4ff6417d83c06df5c5
parent78bec32a86efa9e283ff88fcf57ff88dafb8c51f (diff)
parentc6639b24e604d57b25e90166c437228cbc8f8e4c (diff)
downloadlibhidl-android13-mainline-resolv-release.tar.gz
Snap for 9558569 from c6639b24e604d57b25e90166c437228cbc8f8e4c to mainline-resolv-releaseaml_res_331820000android13-mainline-resolv-release
Change-Id: I406cd9a5d50c019e35c2ba0b2df4741dd377f5a3
-rw-r--r--transport/ServiceManagement.cpp5
1 files changed, 4 insertions, 1 deletions
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 bool isDebuggable() {
}
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) {