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

Commit d395df70 authored by Roman Kiryanov's avatar Roman Kiryanov
Browse files

Retire `ro.kernel.android.checkjni` from AndroidRuntime.cpp 



this property is deprecated and emulator now
populates `dalvik.vm.checkjni` to use instead.

Bug: 182291166
Test: getprop dalvik.vm.checkjni
Signed-off-by: default avatarRoman Kiryanov <rkir@google.com>
Change-Id: Ie94b0d6c2e48b731d9cfe0ead380e0f52f662f37
parent e19a1173

core/jni/AndroidRuntime.cpp

+2 −11
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "jni.h"



using namespace android;

using android::base::GetBoolProperty;

using android::base::GetProperty;



extern int register_android_os_Binder(JNIEnv* env);
@@ -727,17 +728,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
        ALOGI("Leaving lock profiling enabled");

    }



    bool checkJni = false;

    property_get("dalvik.vm.checkjni", propBuf, "");

    if (strcmp(propBuf, "true") == 0) {

        checkJni = true;

    } else if (strcmp(propBuf, "false") != 0) {

        /* property is neither true nor false; fall back on kernel parameter */

        property_get("ro.kernel.android.checkjni", propBuf, "");

        if (propBuf[0] == '1') {

            checkJni = true;

        }

    }

    const bool checkJni = GetBoolProperty("dalvik.vm.checkjni", false);

    ALOGV("CheckJNI is %s\n", checkJni ? "ON" : "OFF");

    if (checkJni) {

        /* extended JNI checking */