diff options
author | Tianjie Xu <xunchang@google.com> | 2017-04-22 02:25:17 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-04-22 02:25:17 +0200 |
commit | 0cd8986bc230b2e6336b52f3654800d6968859c1 (patch) | |
tree | 17f765fe1399e23ce57c9d43e4950d60096ec7c6 /recovery.cpp | |
parent | Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3 (diff) | |
parent | Merge "Reboot the device on user build after the install fails" (diff) | |
download | android_bootable_recovery-0cd8986bc230b2e6336b52f3654800d6968859c1.tar android_bootable_recovery-0cd8986bc230b2e6336b52f3654800d6968859c1.tar.gz android_bootable_recovery-0cd8986bc230b2e6336b52f3654800d6968859c1.tar.bz2 android_bootable_recovery-0cd8986bc230b2e6336b52f3654800d6968859c1.tar.lz android_bootable_recovery-0cd8986bc230b2e6336b52f3654800d6968859c1.tar.xz android_bootable_recovery-0cd8986bc230b2e6336b52f3654800d6968859c1.tar.zst android_bootable_recovery-0cd8986bc230b2e6336b52f3654800d6968859c1.zip |
Diffstat (limited to 'recovery.cpp')
-rw-r--r-- | recovery.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/recovery.cpp b/recovery.cpp index b24efa963..99126eedc 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -1593,14 +1593,22 @@ int main(int argc, char **argv) { } } - if (!sideload_auto_reboot && (status == INSTALL_ERROR || status == INSTALL_CORRUPT)) { - copy_logs(); + if (status == INSTALL_ERROR || status == INSTALL_CORRUPT) { ui->SetBackground(RecoveryUI::ERROR); + if (!ui->IsTextVisible()) { + sleep(5); + } } Device::BuiltinAction after = shutdown_after ? Device::SHUTDOWN : Device::REBOOT; - if ((status != INSTALL_SUCCESS && status != INSTALL_SKIPPED && !sideload_auto_reboot) || - ui->IsTextVisible()) { + // 1. If the recovery menu is visible, prompt and wait for commands. + // 2. If the state is INSTALL_NONE, wait for commands. (i.e. In user build, manually reboot into + // recovery to sideload a package.) + // 3. sideload_auto_reboot is an option only available in user-debug build, reboot the device + // without waiting. + // 4. In all other cases, reboot the device. Therefore, normal users will observe the device + // reboot after it shows the "error" screen for 5s. + if ((status == INSTALL_NONE && !sideload_auto_reboot) || ui->IsTextVisible()) { Device::BuiltinAction temp = prompt_and_wait(device, status); if (temp != Device::NO_ACTION) { after = temp; |