diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-10 00:05:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-10 00:05:23 +0000 |
| commit | 24875ce692900bbafec34b12c13c2582f43db513 (patch) | |
| tree | 6e1ead5d16c859cb078eb42a0c6a38b143831279 /core/jni/AndroidRuntime.cpp | |
| parent | 2c34160c283a533a25d22d6a2ae137872cac61cd (diff) | |
| parent | fcd90b1a1bd9a25526c9c2cefda6f0c2cd9f8678 (diff) | |
Merge "Retire `ro.kernel.android.checkjni` from AndroidRuntime.cpp" am: 25807e2f86 am: 5609c37a4f am: fcd90b1a1b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670529
Change-Id: I350c527e1fe0a6badddddcfd150f97c7207c570c
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 916ecd6bb3d2..de4cede6b7fe 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -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 */ |