commit a50cdc1d0aeed250987fe5cde1841c101c1d4946
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 08 18:11:34 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 08 18:11:34 2021 +0000
tree 8497415b4a97380bd60cd0de96854d9c8a874d50
parent 1e9abd4fff7fc7586b97aaa1ea0e99465105f061
parent cd52a78472c4273836c82e9c05a93de96b7897bf

Merge "Populate `ro.boot.dalvik.vm.checkjni` from `android.checkjni`" am: cd52a78472

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1668586

Change-Id: I446bb76914b91ad277455138cc86f35961d60ca1

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index d1ba3c7..c2eb73c 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -1204,6 +1204,18 @@
             // 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);
         }
     });
 }