summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2013-06-11 20:09:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-11 20:09:27 -0700
commitde836890abc7b5381e285833052375cbb85730cb (patch)
treee664bb62db87ff89580d17caacd2af3c87457cf2
parent255405eb19e6a3fa7f7bb4de9b07beacdf65ece9 (diff)
parentef07386e2fca73680214ececc3c9c0ecbb0f6d88 (diff)
downloadnative-de836890abc7b5381e285833052375cbb85730cb.tar.gz
am ef07386e: Prevent IPCThreadState::joinThreadPool from spinning on unexpected error
* commit 'ef07386e2fca73680214ececc3c9c0ecbb0f6d88': Prevent IPCThreadState::joinThreadPool from spinning on unexpected error
-rw-r--r--libs/binder/IPCThreadState.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
index 6e83faab7e..2ffa92779e 100644
--- a/libs/binder/IPCThreadState.cpp
+++ b/libs/binder/IPCThreadState.cpp
@@ -466,6 +466,10 @@ void IPCThreadState::joinThreadPool(bool isMain)
result = executeCommand(cmd);
+ } else if (result != TIMED_OUT && result != -ECONNREFUSED && result != -EBADF) {
+ ALOGE("talkWithDriver(fd=%d) returned unexpected error %d, aborting",
+ mProcess->mDriverFD, result);
+ abort();
}
// After executing the command, ensure that the thread is returned to the