Merge "Don't call exit() with threads running" am: b7383f2c5f am: 1ae9099377

Change-Id: I5d2991ced189f98aab1a28b847d80085ab01f235
2020-04-13 19:36:25 +00:00
parent 1b7ea3603c 1ae9099377
commit 3aa3badfee
1 changed files with 1 additions and 2 deletions
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -1244,12 +1244,11 @@ void AndroidRuntime::exit(int code)
 {
    if (mExitWithoutCleanup) {
        ALOGI("VM exiting with result code %d, cleanup skipped.", code);
-        ::_exit(code);
    } else {
        ALOGI("VM exiting with result code %d.", code);
        onExit(code);
-        ::exit(code);
    }
+    ::_exit(code);
 }

 void AndroidRuntime::onVmCreated(JNIEnv* env)