Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3aa3badf authored by Hans Boehm's avatar Hans Boehm Committed by Automerger Merge Worker
Browse files

Merge "Don't call exit() with threads running" am: b7383f2c am: 1ae90993 

Change-Id: I5d2991ced189f98aab1a28b847d80085ab01f235
parents 1b7ea360 1ae90993

core/jni/AndroidRuntime.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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)