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 /recovery_main.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 'recovery_main.cpp')
-rw-r--r-- | recovery_main.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/recovery_main.cpp b/recovery_main.cpp index f78c1c78..aba9c5d7 100644 --- a/recovery_main.cpp +++ b/recovery_main.cpp @@ -471,12 +471,7 @@ int main(int argc, char** argv) { switch (ret) { case Device::SHUTDOWN: ui->Print("Shutting down...\n"); - Shutdown("recovery"); - break; - - case Device::SHUTDOWN_FROM_FASTBOOT: - ui->Print("Shutting down...\n"); - Shutdown("fastboot"); + Shutdown(); break; case Device::REBOOT_BOOTLOADER: @@ -525,19 +520,9 @@ int main(int argc, char** argv) { fastboot = false; break; - case Device::REBOOT: - ui->Print("Rebooting...\n"); - Reboot("recovery_menu"); - break; - - case Device::REBOOT_FROM_FASTBOOT: - ui->Print("Rebooting...\n"); - Reboot("fastboot_menu"); - break; - default: ui->Print("Rebooting...\n"); - Reboot("unknown" + std::to_string(ret)); + Reboot(""); break; } } |