diff options
| author | Steven Moreland <smoreland@google.com> | 2022-08-09 18:41:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-09 18:41:14 +0000 |
| commit | 3db12156b38bcf7e66f7ab5307d87b40ef76ccb0 (patch) | |
| tree | 13ab595f04ea5f8f10fec4c36c3baee4e8f186bc | |
| parent | 0d78eac39683440295ae093ec8bb6ad1cf74f60c (diff) | |
| parent | 4acdab765889164c3a792c8c15e6e20022de62a1 (diff) | |
| download | libhidl-temp_sam_242648940.tar.gz | |
libhidl: check ro.debuggable less am: 4acdab7658temp_sam_242648940
Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2180435
Change-Id: I6836f95dd2b731a3dd247dd734bfeebb04c8d47e
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 5d1979f..f3ee611 100644 --- a/transport/ServiceManagement.cpp +++ b/transport/ServiceManagement.cpp @@ -175,12 +175,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) { |