diff options
| author | Tao Bao <tbao@google.com> | 2019-05-23 06:18:45 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-23 06:18:45 +0200 |
| commit | 863c8f36dd12da32f522d94cfe0d832282afda55 (patch) | |
| tree | 7bf1822b27299a1492ea4fbc30b800c037afd162 /recovery_main.cpp | |
| parent | Merge "recovery: report compliant reboot reason" am: d31fb2e7fc (diff) | |
| parent | Merge "Revert "recovery: report compliant reboot reason"" (diff) | |
| download | android_bootable_recovery-863c8f36dd12da32f522d94cfe0d832282afda55.tar android_bootable_recovery-863c8f36dd12da32f522d94cfe0d832282afda55.tar.gz android_bootable_recovery-863c8f36dd12da32f522d94cfe0d832282afda55.tar.bz2 android_bootable_recovery-863c8f36dd12da32f522d94cfe0d832282afda55.tar.lz android_bootable_recovery-863c8f36dd12da32f522d94cfe0d832282afda55.tar.xz android_bootable_recovery-863c8f36dd12da32f522d94cfe0d832282afda55.tar.zst android_bootable_recovery-863c8f36dd12da32f522d94cfe0d832282afda55.zip | |
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 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; } } |