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

Commit af5f7416 authored by Alistair Delva's avatar Alistair Delva Committed by Automerger Merge Worker
Browse files

Merge "init: check for verifiedbootstate in properties" am: fb1cffb4 am:... 

Merge "init: check for verifiedbootstate in properties" am: fb1cffb4 am: daa9eebc am: 0cf1df82 am: 1fa0bd44

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ad5667a547838e299ee50d99ecf86fac2d7cf28
parents 2413877b 1fa0bd44

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) {