commit 0f28653ab3c69463502f94186c6c2582d45b7135
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 26 02:02:13 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 26 02:02:13 2018 +0000
tree 1877bdf0537dd515e29ef16f2e330e8ee42fdf15
parent 6bd4072ffa00d1810744a5f5c66e98e64fa70cc1
parent 52885873aa55c1623ba206bd278f0d68deb32524

Merge "Set device lock status from kernel command line."

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index e5c1548..47cfe32 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -346,12 +346,12 @@
     if (!android::base::GetBoolProperty("ro.oem_unlock_supported", false)) {
         return;
     }
-
-    std::string value = GetProperty("ro.boot.verifiedbootstate", "");
-
-    if (!value.empty()) {
-        property_set("ro.boot.flash.locked", value == "orange" ? "0" : "1");
-    }
+    import_kernel_cmdline(
+            false, [](const std::string& key, const std::string& value, bool in_qemu) {
+                if (key == "androidboot.verifiedbootstate") {
+                    property_set("ro.boot.flash.locked", value == "orange" ? "0" : "1");
+                }
+            });
 }
 
 static void export_kernel_boot_props() {