Snap for 9549188 from c6639b24e604d57b25e90166c437228cbc8f8e4c to mainline-uwb-release
Change-Id: I464ec64695d77d8e8a225296cf49c3c7cd092e86
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) {