commit 11c1acc33a7402153ab0e7308bc59921165819ab
author Iliyan Malchev <malchev@google.com> Fri Apr 14 15:08:32 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 14 15:08:32 2017 +0000
tree cafe2c6e7017f011d62ad5fd75e6eedce5e4fe5e
parent f18f8fe8cbc991ff2518e2a649325872e2d53aac
parent ed1ffe06f3efc791d57ed2709bb5177f3067ece8

Merge "binder: allow repeated invocations of initWithDriver" into oc-dev

libs/binder/ProcessState.cpp

diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp
index 9ccf07c..add5e74 100644
--- a/libs/binder/ProcessState.cpp
+++ b/libs/binder/ProcessState.cpp
@@ -79,6 +79,11 @@
 {
     Mutex::Autolock _l(gProcessMutex);
     if (gProcess != NULL) {
+        // Allow for initWithDriver to be called repeatedly with the same
+        // driver.
+        if (!strcmp(gProcess->getDriverName().c_str(), driver)) {
+            return gProcess;
+        }
         LOG_ALWAYS_FATAL("ProcessState was already initialized.");
     }
     gProcess = new ProcessState(driver);