| commit | fd1192bbfd8c6cd63137b57755e32e6f644cde93 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Thu Jan 26 01:37:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 26 01:37:29 2023 +0000 |
| tree | 5d23e0e21a3f000dd0072d4ff6417d83c06df5c5 | |
| parent | e2a8c428f871c8b01be49059d0ea3af9234c1222 [diff] | |
| parent | 59af9c82dc648360340958983646473d63ca103b [diff] |
libhidl: check ro.debuggable less am: 59af9c82dc Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libhidl/+/21105968 Change-Id: I1b8df4af966b9da05bcab76f45afdde85bc9154c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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) {