diff options
| author | 2017-04-19 16:40:49 -0700 | |
|---|---|---|
| committer | 2017-04-19 16:40:49 -0700 | |
| commit | b69ffdb2078e2272fa5637a8c8f2b58020946e20 (patch) | |
| tree | 433c9fbd1461dfcd484c1824022254edb9bfc6ee | |
| parent | f9f8120e56caf757e4a995c6a62273f9210c041d (diff) | |
Stop hwbinder threads from app_process.
To prevent it from hanging up.
Bug: 37500397
Bug: 34085250
Test: DismissDialogsInstrumentation test
Change-Id: Ia69f6a5676666bc9286272b82f242d7b1d0ee286
| -rw-r--r-- | cmds/app_process/Android.mk | 1 | ||||
| -rw-r--r-- | cmds/app_process/app_main.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk index eaad3a7ec529..72fe0516f480 100644 --- a/cmds/app_process/Android.mk +++ b/cmds/app_process/Android.mk @@ -5,6 +5,7 @@ app_process_common_shared_libs := \ libbinder \ libcutils \ libdl \ + libhwbinder \ liblog \ libnativeloader \ libutils \ 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); |