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

Commit a0f3a2d3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Retire `ro.kernel.android.checkjni` from AndroidRuntime.cpp" am:... 

Merge "Retire `ro.kernel.android.checkjni` from AndroidRuntime.cpp" am: 25807e2f am: 5609c37a am: fcd90b1a am: 24875ce6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670529

Change-Id: I98193eff44de293177a918e57ba8cf4b2aea01ad
parents 93cb6f68 24875ce6

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);
@@ -735,17 +736,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 */