From 4967067480ada9c475a8d8abaa853bf9cb8620f3 Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Wed, 6 Sep 2023 19:57:03 +0000 Subject: Look for hwservicemanager in it's old location as well Mainline modules take the newer version of libhidl and use it on older devices that will still have hwservicemanager in /system/bin/ instead of /system_ext/bin so we still need to look there. Test: m Test: rerun testcase from bug including this CL Bug: 298669409 Change-Id: I52f0e8b3dd63a0fff9c265bc9f229ab63a66ffde --- transport/ServiceManagement.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } /* -- cgit v1.2.3