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

Commit 1bbd4ae2 authored by Hans Boehm's avatar Hans Boehm Committed by Automerger Merge Worker
Browse files

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

Change-Id: I8a718933854de5f424009d98465b964ed807594e
parents dc0bae26 343a5d37

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)