| commit | deb7313aff6deac5c26bc27dbf7aa9563f544bcf | [log] [tgz] |
|---|---|---|
| author | Devin Moore <devinmoore@google.com> | Wed Sep 06 23:44:24 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 06 23:44:24 2023 +0000 |
| tree | 3079a2e22c0deb3869fe0596321d760405939222 | |
| parent | 2a1bfdc0aed92c219fc08a26864934636e2f9da6 [diff] | |
| parent | 9b3601e9f1e4091d75e11b00c2800ed50366bc38 [diff] |
Merge "Look for hwservicemanager in it's old location as well" into main am: 424964b8f7 am: 9b3601e9f1 Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2744313 Change-Id: I2d9b944141b7eab3755bb6c4392af53d1c1459be 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 78c1e96..6d85b57 100644 --- a/transport/ServiceManagement.cpp +++ b/transport/ServiceManagement.cpp
@@ -211,7 +211,8 @@ } 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; } /*