commit b71814ce8a0463baf11f395e1fb06c0975666925
author Tianjie Xu <xunchang@google.com> Thu Jul 18 22:59:55 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jul 18 22:59:55 2019 -0700
tree 67cb2f49ff9fa92df451a2f4ce7ce50e073e610f
parent 7bd0aa24dd3d01dd2c5e5f9261c427457f9f50e6
parent 2e9e117e81bfc978eb4f334978c35bb03443b3bf

Merge "Revert "init: Write the reason in BCB on "reboot recovery"""
am: 85bbbe5695

Change-Id: I0c7234ad4b1d797ae031844b51df4d717f44e6a7

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index cb54d34..0e61348 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -669,13 +669,6 @@
                                   "bootloader_message: "
                                << err;
                 }
-            } else if (reboot_target == "recovery") {
-                const std::vector<std::string> options = {};
-                std::string err;
-                if (!write_bootloader_message(options, &err)) {
-                    LOG(ERROR) << "Failed to set bootloader message: " << err;
-                    return false;
-                }
             } else if (reboot_target == "sideload" || reboot_target == "sideload-auto-reboot" ||
                        reboot_target == "fastboot") {
                 std::string arg = reboot_target == "sideload-auto-reboot" ? "sideload_auto_reboot"