commit 0bacb860d65297f728d98045309da6831c8f19ee
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 09 10:17:12 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 09 10:17:13 2016 +0000
tree 0f739ab132ccdb98a927c4b664f01ddddde7a122
parent 097a767ec6001f1a4c68efc5d83c12d0ce6d1fa9
parent 277f06117f1444d0948c419646f4f6850d5610e3

Merge "Don't initialize ProcessState without /dev/hwbinder."

IServiceManager.cpp

diff --git a/IServiceManager.cpp b/IServiceManager.cpp
index fd0e485..5bb6b92 100644
--- a/IServiceManager.cpp
+++ b/IServiceManager.cpp
@@ -35,7 +35,11 @@
 sp<IServiceManager> defaultServiceManager()
 {
     if (gDefaultServiceManager != NULL) return gDefaultServiceManager;
-
+    if (access("/dev/hwbinder", F_OK) != 0) {
+        // HwBinder not available on this device or not accessible to
+        // this process.
+        return nullptr;
+    }
     {
         AutoMutex _l(gDefaultServiceManagerLock);
         while (gDefaultServiceManager == NULL) {