summaryrefslogtreecommitdiff
path: root/cmds/app_process/app_main.cpp
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2017-04-19 16:40:49 -0700
committerMartijn Coenen <maco@google.com>2017-04-19 16:40:49 -0700
commitb69ffdb2078e2272fa5637a8c8f2b58020946e20 (patch)
tree433c9fbd1461dfcd484c1824022254edb9bfc6ee /cmds/app_process/app_main.cpp
parentf9f8120e56caf757e4a995c6a62273f9210c041d (diff)
Stop hwbinder threads from app_process.
To prevent it from hanging up. Bug: 37500397 Bug: 34085250 Test: DismissDialogsInstrumentation test Change-Id: Ia69f6a5676666bc9286272b82f242d7b1d0ee286
Diffstat (limited to 'cmds/app_process/app_main.cpp')
-rw-r--r--cmds/app_process/app_main.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp
index 0ea141c292dd..e56417b82fc0 100644
--- a/cmds/app_process/app_main.cpp
+++ b/cmds/app_process/app_main.cpp
@@ -14,7 +14,7 @@
#include <unistd.h>
#include <binder/IPCThreadState.h>
-#include <binder/ProcessState.h>
+#include <hwbinder/IPCThreadState.h>
#include <utils/Log.h>
#include <cutils/memory.h>
#include <cutils/properties.h>
@@ -85,6 +85,7 @@ public:
ar->callMain(mClassName, mClass, mArgs);
IPCThreadState::self()->stopProcess();
+ hardware::IPCThreadState::self()->stopProcess();
}
virtual void onZygoteInit()
@@ -99,6 +100,7 @@ public:
if (mClassName.isEmpty()) {
// if zygote
IPCThreadState::self()->stopProcess();
+ hardware::IPCThreadState::self()->stopProcess();
}
AndroidRuntime::onExit(code);