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

Commit 1f300d3e authored by Oleg Matcovschi's avatar Oleg Matcovschi Committed by Automerger Merge Worker
Browse files

Merge "fastboot: derive device locked state from Android property" am:... 

Merge "fastboot: derive device locked state from Android property" am: b16ef309 am: 2d48fcf4 am: 3c4976dc

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

Change-Id: I485381b225487c3cd691b28e92399014e9a04d03
parents a0e4c16c 3c4976dc

fastboot/device/utility.cpp

+1 −6
Original line number Diff line number Diff line
@@ -204,12 +204,7 @@ std::vector<std::string> ListPartitions(FastbootDevice* device) { 
}



bool GetDeviceLockStatus() {

    std::string cmdline;

    // Return lock status true if unable to read kernel command line.

    if (!android::base::ReadFileToString("/proc/cmdline", &cmdline)) {

        return true;

    }

    return cmdline.find("androidboot.verifiedbootstate=orange") == std::string::npos;

    return android::base::GetProperty("ro.boot.verifiedbootstate", "") != "orange";

}



bool UpdateAllPartitionMetadata(FastbootDevice* device, const std::string& super_name,