diff options
| author | Steven Moreland <smoreland@google.com> | 2022-08-09 19:00:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-09 19:00:37 +0000 |
| commit | a196f6bc037e7e9dd0844a43bc5300f95b31dae7 (patch) | |
| tree | 13ab595f04ea5f8f10fec4c36c3baee4e8f186bc | |
| parent | d51ebc4c55cd753b289e1d671e697565c749e8e2 (diff) | |
| parent | 3db12156b38bcf7e66f7ab5307d87b40ef76ccb0 (diff) | |
| download | libhidl-a196f6bc037e7e9dd0844a43bc5300f95b31dae7.tar.gz | |
libhidl: check ro.debuggable less am: 4acdab7658 am: 3db12156b3
Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2180435
Change-Id: Ic90001c03b37d6ceb6689e1036a8069f2ebd9cf9
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) { |