commit fb1cffb46b600c284bf6c7c16224981a816863b8
author Alistair Delva <adelva@google.com> Mon Mar 15 04:03:17 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 15 04:03:17 2021 +0000
tree df3da4e32049519f737690f84a6f28537c37fc59
parent b56165cce328bc20760bbe5f53905452cacd5e1b
parent 6c01baf075b6c9de1939afca86b6069355348710

Merge "init: check for verifiedbootstate in properties"

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 70d6809..7264b22 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -518,11 +518,9 @@
     if (!android::base::GetBoolProperty("ro.oem_unlock_supported", false)) {
         return;
     }
-    ImportKernelCmdline([](const std::string& key, const std::string& value) {
-        if (key == "androidboot.verifiedbootstate") {
-            SetProperty("ro.boot.flash.locked", value == "orange" ? "0" : "1");
-        }
-    });
+    SetProperty(
+            "ro.boot.flash.locked",
+            android::base::GetProperty("ro.boot.verifiedbootstate", "") == "orange" ? "0" : "1");
 }
 
 static Result<void> property_enable_triggers_action(const BuiltinArguments& args) {