Merge "fastboot: derive device locked state from Android property"
This commit is contained in:
commit
b16ef309d6
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue