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

Commit f4d8d90a authored by Hans Boehm's avatar Hans Boehm Committed by Android (Google) Code Review
Browse files

Merge "Don't call exit() with threads running" into rvc-dev

parents 386cdc2c 8242eab2

core/jni/AndroidRuntime.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -1244,12 +1244,11 @@ void AndroidRuntime::exit(int code) 
{

{

    if (mExitWithoutCleanup) {

    if (mExitWithoutCleanup) {

        ALOGI("VM exiting with result code %d, cleanup skipped.", code);

        ALOGI("VM exiting with result code %d, cleanup skipped.", code);

        ::_exit(code);

    } else {

    } else {

        ALOGI("VM exiting with result code %d.", code);

        ALOGI("VM exiting with result code %d.", code);

        onExit(code);

        onExit(code);

        ::exit(code);

    }

    }

    ::_exit(code);

}

}





void AndroidRuntime::onVmCreated(JNIEnv* env)

void AndroidRuntime::onVmCreated(JNIEnv* env)