diff options
| author | Roman Kiryanov <rkir@google.com> | 2021-04-08 17:13:13 -0700 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2021-04-09 12:46:34 -0700 |
| commit | d395df70242820b87850d55e08a9c43d1f02e7b9 (patch) | |
| tree | 1dccee261a692366e8ffd85121283d598571362b /core/jni/AndroidRuntime.cpp | |
| parent | e19a117397c6343e855646bbe5740c38db134176 (diff) | |
Retire `ro.kernel.android.checkjni` from AndroidRuntime.cpp
this property is deprecated and emulator now
populates `dalvik.vm.checkjni` to use instead.
Bug: 182291166
Test: getprop dalvik.vm.checkjni
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ie94b0d6c2e48b731d9cfe0ead380e0f52f662f37
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 */ |