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

am: 85bbbe5695

Change-Id: I0c7234ad4b1d797ae031844b51df4d717f44e6a7
This commit is contained in:
Tianjie Xu 2019-07-18 22:59:55 -07:00 committed by android-build-merger
commit 79d95556b1

View file

@ -669,13 +669,6 @@ bool HandlePowerctlMessage(const std::string& command) {
"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"