diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-10 23:06:46 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-10 23:06:46 +0000 |
| commit | 2946f76a85ed162fe5f401f5b2b47a79e8e79e5c (patch) | |
| tree | bb67cd8615e914753a98404ecf6e1cf635a79d0a /core/jni/AndroidRuntime.cpp | |
| parent | 500ebeee4c913fae6cc3439ff78c6614f20de191 (diff) | |
| parent | d8a78dcb51f7281bd89f222f8e84bb0e7d394b40 (diff) | |
Snap for 7273999 from d8a78dcb51f7281bd89f222f8e84bb0e7d394b40 to sc-release
Change-Id: I4b329ee2364d7f7f5548bb50476cd8bf970e5282
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 */ |