diff options
| author | Tao Bao <tbao@google.com> | 2019-05-22 18:03:01 +0000 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2019-05-22 11:06:26 -0700 |
| commit | feefbf2f5698a5a56adb80a057dba0bc07050c09 (patch) | |
| tree | 45ea6aa3e7a034f376969cbc45b5e0b9ab630e17 /fastboot/fastboot.cpp | |
| parent | d31fb2e7fc7dd0afef5404d52700027c755c8ff2 (diff) | |
Revert "recovery: report compliant reboot reason"
This reverts commit 6f4e4db4f9e0911a07c6393d01e4380e844f7891.
Reason for revert: Booting out of recovery (choose `Reboot system now`)
on taimen is broken. Device keeps booting back into recovery.
Bug: 133326470
Test: Choose `Reboot system now` from recovery menu. Deivce attempts
normal boot.
Change-Id: I6e85fc248e18953a6fb94513c3abc7e7e0fb0477
Diffstat (limited to 'fastboot/fastboot.cpp')
| -rw-r--r-- | fastboot/fastboot.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 20233499..14f5e4bd 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -30,10 +30,10 @@ #include "recovery_ui/ui.h" static const std::vector<std::pair<std::string, Device::BuiltinAction>> kFastbootMenuActions{ - { "Reboot system now", Device::REBOOT_FROM_FASTBOOT }, + { "Reboot system now", Device::REBOOT }, { "Enter recovery", Device::ENTER_RECOVERY }, { "Reboot to bootloader", Device::REBOOT_BOOTLOADER }, - { "Power off", Device::SHUTDOWN_FROM_FASTBOOT }, + { "Power off", Device::SHUTDOWN }, }; Device::BuiltinAction StartFastboot(Device* device, const std::vector<std::string>& /* args */) { |