diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-09 23:00:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-09 23:00:06 +0000 |
| commit | fcd90b1a1bd9a25526c9c2cefda6f0c2cd9f8678 (patch) | |
| tree | f947b6856feae4ffb9df6c1ac7218e141d1dd407 /core/jni/AndroidRuntime.cpp | |
| parent | 4551493131f0348ec28a01eb27f4b5d17e18550b (diff) | |
| parent | 5609c37a4fcdf0d0ee5ebab2deb8ec8199233c28 (diff) | |
Merge "Retire `ro.kernel.android.checkjni` from AndroidRuntime.cpp" am: 25807e2f86 am: 5609c37a4f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670529
Change-Id: Iad8b1d4e48dfb2f6984afcbc815d39da609260aa
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 ed84434adff5..855448b21069 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); @@ -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 */ |