summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-02 22:52:14 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-02 22:52:14 +0000
commit6ef565a7b7299bc98c07a000536c8c3d6101674b (patch)
tree5d23e0e21a3f000dd0072d4ff6417d83c06df5c5
parent9fe2390472ae5b991501c006e305b9fe3b693520 (diff)
parentc6639b24e604d57b25e90166c437228cbc8f8e4c (diff)
downloadlibhidl-android13-mainline-adservices-release.tar.gz
Snap for 9556825 from c6639b24e604d57b25e90166c437228cbc8f8e4c to mainline-adservices-releaseaml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190android13-mainline-adservices-release
Change-Id: Ie7e7150780edc0627b378ebd8d4c0e4000c5bc78
-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) {