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

Change-Id: Ica640e49c31850cb63a71d62f8feefa08ca077bf
2020-04-13 19:56:07 +00:00
parent 83110e4584 3aa3badfee
commit f8bdfd1772
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)