commit b16ef309d6dd5052900ba3712a3d8a1d7981a657
author Oleg Matcovschi <omatcovschi@google.com> Fri Mar 26 01:26:57 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 26 01:26:57 2021 +0000
tree 40d0f4831dcce842d0d4a9be78778e4e46366a24
parent 4e94784b1485482ff3a454eb73ebccfc08153c24
parent d0a16c20fc71e1a20d290723416581743194d392

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

fastboot/device/utility.cpp

diff --git a/fastboot/device/utility.cpp b/fastboot/device/utility.cpp
index f9267e0..07ad902 100644
--- a/fastboot/device/utility.cpp
+++ b/fastboot/device/utility.cpp
@@ -204,12 +204,7 @@
 }
 
 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,