From feefbf2f5698a5a56adb80a057dba0bc07050c09 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 22 May 2019 18:03:01 +0000 Subject: 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 --- recovery_main.cpp | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'recovery_main.cpp') diff --git a/recovery_main.cpp b/recovery_main.cpp index f78c1c788..aba9c5d75 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; } } -- cgit v1.2.3