From 5ed32780b4d6f215ad591e6259f7235150b26a63 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Tue, 25 Sep 2018 15:43:42 -0700 Subject: [PATCH] Set device lock status from kernel command line. Device is considered to be unlocked if androidboot.verifiedbootstate is "orange". Test: adb shell getprop ro.boot.flash.locked Change-Id: Id3aeec757908ea63a37e28ad880a6c71d53083ac --- init/init.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/init/init.cpp b/init/init.cpp index 3ab0a5287..0287e666d 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -344,12 +344,12 @@ static void export_oem_lock_status() { 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() {