From 0312c20a71da5fb1ce155c832f264534bb90a37f Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Wed, 7 Apr 2021 15:16:00 -0700 Subject: [PATCH] Populate `ro.boot.dalvik.vm.checkjni` from `android.checkjni` emulator passes `android.checkjni` in the kernel command which we want to use in frameworks/base/core/jni/AndroidRuntime.cpp Bug: 182291166 Test: getprop ro.boot.dalvik.vm.checkjni Signed-off-by: Roman Kiryanov Change-Id: If9473aa9492fa09d8de7cc8fb08614380e4e15f3 --- init/property_service.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/init/property_service.cpp b/init/property_service.cpp index d1ba3c7ea..c2eb73c61 100644 --- a/init/property_service.cpp +++ b/init/property_service.cpp @@ -1204,6 +1204,18 @@ static void ProcessKernelCmdline() { // emulator specific, should be retired once emulator migrates to // androidboot. InitPropertySet("ro.boot.debug.sf.nobootanimation", "1"); + } else if (key == "android.checkjni") { + // emulator specific, should be retired once emulator migrates to + // androidboot. + std::string value_bool; + if (value == "0") { + value_bool = "false"; + } else if (value == "1") { + value_bool = "true"; + } else { + value_bool = value; + } + InitPropertySet("ro.boot.dalvik.vm.checkjni", value_bool); } }); }