diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2019-05-20 10:36:16 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2019-05-23 13:58:53 -0700 |
| commit | 488cc05c9685277bfba148ad259bde10bdc4a439 (patch) | |
| tree | ec6d221f9f9986f70d9df3660972c7c87d70aaf8 /recovery_main.cpp | |
| parent | 7b67d2851806a6c4d66953564b5d2c052bdc8f9c (diff) | |
recovery: report compliant reboot reason (Part Deux)
shutdown and reboot should have a corresponding sub-reason.
Adding:
"reboot,userrequested,fastboot"
"reboot,userrequested,recovery"
"reboot,userrequested,recovery,ui"
"shutdown,userrequested,fastboot"
"shutdown,userrequested,recovery"
"reboot,unknown#" (Can't happen, debug)
Test: manual, multiple targets, enter recovery, be able to exit recovery
Bug: 133326470
Change-Id: Ibfcb2a23158e8e99922e8053edd815fb592150f2
Diffstat (limited to 'recovery_main.cpp')
| -rw-r--r-- | recovery_main.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/recovery_main.cpp b/recovery_main.cpp index aba9c5d7..7fbdf9a0 100644 --- a/recovery_main.cpp +++ b/recovery_main.cpp @@ -471,7 +471,12 @@ int main(int argc, char** argv) { switch (ret) { case Device::SHUTDOWN: ui->Print("Shutting down...\n"); - Shutdown(); + Shutdown("userrequested,recovery"); + break; + + case Device::SHUTDOWN_FROM_FASTBOOT: + ui->Print("Shutting down...\n"); + Shutdown("userrequested,fastboot"); break; case Device::REBOOT_BOOTLOADER: @@ -520,9 +525,19 @@ int main(int argc, char** argv) { fastboot = false; break; + case Device::REBOOT: + ui->Print("Rebooting...\n"); + Reboot("userrequested,recovery"); + break; + + case Device::REBOOT_FROM_FASTBOOT: + ui->Print("Rebooting...\n"); + Reboot("userrequested,fastboot"); + break; + default: ui->Print("Rebooting...\n"); - Reboot(""); + Reboot("unknown" + std::to_string(ret)); break; } } |