diff options
| author | Steven Moreland <smoreland@google.com> | 2023-01-26 01:36:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-26 01:36:28 +0000 |
| commit | c6639b24e604d57b25e90166c437228cbc8f8e4c (patch) | |
| tree | 5d23e0e21a3f000dd0072d4ff6417d83c06df5c5 | |
| parent | 887a9930a6a0b5954f395376dbf6a139aba72c58 (diff) | |
| parent | 59af9c82dc648360340958983646473d63ca103b (diff) | |
| download | libhidl-c6639b24e604d57b25e90166c437228cbc8f8e4c.tar.gz | |
libhidl: check ro.debuggable less am: 59af9c82dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libhidl/+/21105968
Change-Id: I880bfff4f33a32bfeef376706d3f11b06765e7a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | transport/ServiceManagement.cpp | 5 |
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) { |