commit 2539abb615c8adb1ffa21480304663a19ae2d3f7
author Steven Moreland <smoreland@google.com> Wed Dec 20 18:48:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 20 18:48:46 2017 +0000
tree aade43ccea516c4ed4cf72c592fc9b0e0c648c36
parent 67d21a8323afa07d861628ffbdc69c1849546fba
parent d2dc3fc9d3729cce0dabcb36188336a908989433

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

Change-Id: Iea6df244c852ce5be4d459f37429ac164334ba62

libs/binder/ProcessState.cpp

diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp
index 11dd525..da806aa 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();