Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Retire ro.kernel.android.checkjni from AndroidRuntime.cpp" am: 25807e2f86 am: 5609c37a4f

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

Change-Id: Iad8b1d4e48dfb2f6984afcbc815d39da609260aa
This commit is contained in:
Treehugger Robot
2021-04-09 23:00:06 +00:00
committed by Automerger Merge Worker
parent 4551493131 5609c37a4f
commit fcd90b1a1b
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/jni/AndroidRuntime.cpp
View File

@@ -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 */