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" am: b7383f2c5f am: 1ae9099377

Browse Source 
Change-Id: I5d2991ced189f98aab1a28b847d80085ab01f235
This commit is contained in:
Hans Boehm
2020-04-13 19:36:25 +00:00
committed by Automerger Merge Worker
parent 1b7ea3603c 1ae9099377
commit 3aa3badfee
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)