diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-04-23 22:36:54 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-04-23 22:36:54 +0000 |
| commit | 81abbc1d7858f29d3344ff6f1702ece80eab8341 (patch) | |
| tree | b06d90c8277a04e4f8156d9b20d1611a974156e0 /core/jni/AndroidRuntime.cpp | |
| parent | 857ef130fbeed8d0eb46cc1bfc9f75138f11c4e6 (diff) | |
| parent | bd33c1d7942f5aad3e313cbd447056b720d1149b (diff) | |
Merge SP1A.210412.001
Change-Id: I0e1c2f5679d5f721cd605b7da785959763311698
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 ecafde4201fa..0cdde565789d 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); @@ -737,17 +738,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 */ |