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

Change-Id: I8a718933854de5f424009d98465b964ed807594e
2020-04-21 11:05:38 +00:00
parent dc0bae26e2 343a5d37e6
commit 1bbd4ae252
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)