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

Commit 1ae90993 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 

Change-Id: Ib8b6c1d12000bdc75461774d9aff2feb30afbcd4
parents 2e2b52d5 b7383f2c

core/jni/AndroidRuntime.cpp

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