Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbcc01c8 authored by Tianjie Xu's avatar Tianjie Xu Committed by android-build-merger
Browse files

Merge "Revert "init: Write the reason in BCB on "reboot recovery""" am: 85bbbe56 am: 79d95556 

am: 65d0bc72

Change-Id: Ifeebc94260ca20cc68178e46a1a2b5cfea7a9df0
parents 91467658 65d0bc72

init/reboot.cpp

+0 −7
Original line number Diff line number Diff line
@@ -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"