diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-09 22:41:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-09 22:41:35 +0000 |
| commit | 5609c37a4fcdf0d0ee5ebab2deb8ec8199233c28 (patch) | |
| tree | 216cc68f307a5f9ca102b9cdb0a36f7de81393b6 /core/jni/AndroidRuntime.cpp | |
| parent | 6aec468bffea36ca1b8847609706b1c97c02f6e7 (diff) | |
| parent | 25807e2f865af1e231f1437a066461e875fb22cd (diff) | |
Merge "Retire `ro.kernel.android.checkjni` from AndroidRuntime.cpp" am: 25807e2f86
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670529
Change-Id: Ie64ab2dbafb30a17851581d53b3ff8b8f6f45359
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 */ |