Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't call exit() with threads running" into rvc-dev am: f4d8d90a59

Browse Source 
Change-Id: I4dd8f54b7927b92bca41190ce6633871ea5fb2e1
This commit is contained in:
Hans Boehm
2020-04-21 10:58:35 +00:00
committed by Automerger Merge Worker
parent c43f0e5df0 f4d8d90a59
commit 343a5d37e6
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/AndroidRuntime.cpp
View File

@@ -1244,12 +1244,11 @@ void AndroidRuntime::exit(int code)
{ {
if (mExitWithoutCleanup) { if (mExitWithoutCleanup) {
ALOGI("VM exiting with result code %d, cleanup skipped.", code); ALOGI("VM exiting with result code %d, cleanup skipped.", code);
::_exit(code);
} else { } else {
ALOGI("VM exiting with result code %d.", code); ALOGI("VM exiting with result code %d.", code);
onExit(code); onExit(code);
::exit(code);
} }
::_exit(code);
} }
void AndroidRuntime::onVmCreated(JNIEnv* env) void AndroidRuntime::onVmCreated(JNIEnv* env)