commit adb1320e43449b61d03b5e9827df91970819cf62
author Devin Moore <devinmoore@google.com> Mon Dec 04 17:04:27 2023 +0000
committer Devin Moore <devinmoore@google.com> Mon Dec 04 17:08:22 2023 +0000
tree 901e85c433bc52e57c8178c40a9871f66045c533
parent 2d2e4c0596980499478db1b5881e19e960422c10

If hwservicemanager isn't installed, isHidlSupported == false

If hwservicemanager isn't on the device, then HIDL isn't supported.

Test: m
Bug: 218588089
Bug: 314116033
Change-Id: Ife5e7761f58edb6edfa6dcd5a874ad3937407638

transport/ServiceManagement.cpp

diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index c3d3fa4..8867f53 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -211,7 +211,16 @@
            fqName == IServiceManager1_2::descriptor;
 }
 
+static bool isHwServiceManagerInstalled() {
+    return access("/system_ext/bin/hwservicemanager", F_OK) == 0 ||
+           access("/system/system_ext/bin/hwservicemanager", F_OK) == 0 ||
+           access("/system/bin/hwservicemanager", F_OK) == 0;
+}
+
 bool isHidlSupported() {
+    if (!isHwServiceManagerInstalled()) {
+        return false;
+    }
 #ifdef __ANDROID__
     // TODO(b/218588089) remove this temporary support variable once Cuttlefish
     // (the only current Android V launching device) no longer requires HIDL.