summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-01-10 00:27:52 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-01-10 00:27:52 +0000
commit317b06c1f0fcf625900f611175ec849a267bf64a (patch)
tree5d23e0e21a3f000dd0072d4ff6417d83c06df5c5
parent7e63cb8013183debbe434b2395b8fb201bfdd28c (diff)
parent3b6a233eba04571ea6178d0c49e126b099de1b30 (diff)
downloadlibhidl-317b06c1f0fcf625900f611175ec849a267bf64a.tar.gz
Snap for 9470583 from 3b6a233eba04571ea6178d0c49e126b099de1b30 to tm-qpr3-release
Change-Id: I23337a5f7c473b6de1bd2631eaf04c28377ec10d
-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) {