diff options
| author | Devin Moore <devinmoore@google.com> | 2023-09-06 22:52:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-06 22:52:22 +0000 |
| commit | 9b3601e9f1e4091d75e11b00c2800ed50366bc38 (patch) | |
| tree | 3079a2e22c0deb3869fe0596321d760405939222 | |
| parent | 9500d88f1d747346de60f9585c36cc14ec27b990 (diff) | |
| parent | 424964b8f711df82d550671a2f80c20bd40e1935 (diff) | |
| download | libhidl-tmp_amf_298295554.tar.gz | |
Merge "Look for hwservicemanager in it's old location as well" into main am: 424964b8f7tmp_amf_298295554
Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2744313
Change-Id: I351fb6e50ca7dad86f1cd8d78a612e4612e78af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | transport/ServiceManagement.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp index 78c1e96..6d85b57 100644 --- a/transport/ServiceManagement.cpp +++ b/transport/ServiceManagement.cpp @@ -211,7 +211,8 @@ static bool isServiceManager(const hidl_string& fqName) { } static bool isHwServiceManagerInstalled() { return access("/system_ext/bin/hwservicemanager", F_OK) == 0 || - access("/system/system_ext/bin/hwservicemanager", F_OK) == 0; + access("/system/system_ext/bin/hwservicemanager", F_OK) == 0 || + access("/system/bin/hwservicemanager", F_OK) == 0; } /* |