Merge "init: check for verifiedbootstate in properties" am: fb1cffb46b am: daa9eebcf4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f517e0d4eed84c257e1ef1e65ff555447c4b6c3
This commit is contained in:
Alistair Delva 2021-03-15 05:02:59 +00:00 committed by Automerger Merge Worker
commit 0cf1df828e

View file

@ -518,11 +518,9 @@ static void export_oem_lock_status() {
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) {