commit 108275e298e4d1e0d2c8943a10342c00f34897af
author Sami Tolvanen <samitolvanen@google.com> Wed Dec 09 16:08:06 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 09 16:08:06 2015 +0000
tree 25ceed8e6e62b3ce2da265ceca5a470604ff04cb
parent b2e0a9302d42fea51ee816a26b7390d034db2d42
parent bfb687d8a941aeb0c7e0b0ff638bc0bf1e740a1c

Merge "init: set ro.boot.flash.locked from ro.boot.verifiedbootstate" am: 85abb0860e
am: 226914be6a

* commit '226914be6ad06f1ccbdcd2ea584e748a02665e2d':
  init: set ro.boot.flash.locked from ro.boot.verifiedbootstate

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 9f4f625..4aef823 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -350,6 +350,18 @@
     }
 }
 
+static void export_oem_lock_status() {
+    if (property_get("ro.oem_unlock_supported") != "1") {
+        return;
+    }
+
+    std::string value = property_get("ro.boot.verifiedbootstate");
+
+    if (!value.empty()) {
+        property_set("ro.boot.flash.locked", value == "orange" ? "0" : "1");
+    }
+}
+
 static void export_kernel_boot_props() {
     struct {
         const char *src_prop;
@@ -614,6 +626,7 @@
     signal_handler_init();
 
     property_load_boot_defaults();
+    export_oem_lock_status();
     start_property_service();
 
     const BuiltinFunctionMap function_map;