Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c01baf0 authored by Devin Moore's avatar Devin Moore
Browse files

init: check for verifiedbootstate in properties 

This check in export_oem_lock_status happens after PropertyInit() so
all of the ro.boot.* properties will be set. There is no need to import
the kernel cmdline again.

Test: build and boot cuttlefish
Bug: 173815685
Change-Id: I5df7c0105566d4617442dbb8e77eb26e465775f1
parent 9865e47e

init/init.cpp

+3 −5
Original line number Diff line number Diff line
@@ -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) {