commit 94563fc8d4a947b6f8768764725b3472049e04bd
author Steven Moreland <smoreland@google.com> Wed Dec 20 19:02:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 20 19:02:52 2017 +0000
tree b05a487e9161cd03863135ca85c18043b2911fd9
parent 73945177501b8f30eb2dd12bc1aa8ce3f275fcc1
parent 2539abb615c8adb1ffa21480304663a19ae2d3f7

Merge "Default to /dev/binder if binder node doesn't exist." am: 1a49778ecc am: d2dc3fc9d3
am: 2539abb615

Change-Id: I9dde5c10eb3fe82ee86ba60dc292afe515770143

libs/binder/ProcessState.cpp

diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp
index 44039f8..597fca9 100644
--- a/libs/binder/ProcessState.cpp
+++ b/libs/binder/ProcessState.cpp
@@ -86,6 +86,12 @@
         }
         LOG_ALWAYS_FATAL("ProcessState was already initialized.");
     }
+
+    if (access(driver, R_OK) == -1) {
+        ALOGE("Binder driver %s is unavailable. Using /dev/binder instead.", driver);
+        driver = "/dev/binder";
+    }
+
     gProcess = new ProcessState(driver);
     return gProcess;
 }
@@ -420,7 +426,7 @@
         mVMStart = mmap(0, BINDER_VM_SIZE, PROT_READ, MAP_PRIVATE | MAP_NORESERVE, mDriverFD, 0);
         if (mVMStart == MAP_FAILED) {
             // *sigh*
-            ALOGE("Using /dev/binder failed: unable to mmap transaction memory.\n");
+            ALOGE("Using %s failed: unable to mmap transaction memory.\n", mDriverName.c_str());
             close(mDriverFD);
             mDriverFD = -1;
             mDriverName.clear();