Merge "Don't call exit() with threads running"

2020-04-13 18:51:16 +00:00
parent 2f46cd181a 0fcf4a605d
commit b7383f2c5f
1 changed files with 1 additions and 2 deletions
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -1285,12 +1285,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)