PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reboot the device on user build after the install fails" am: d6f436849d

Browse Source 
am: 4849c87033

Change-Id: I7fd09a998e2a3d21ad9c772179890988b44809b5
This commit is contained in:
Tianjie Xu
2017-04-22 00:25:17 +00:00
committed by android-build-merger
parent 33a8900d2b 4849c87033
commit 0cd8986bc2
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery.cpp
+12 -4
View File
@@ -1593,14 +1593,22 @@ int main(int argc, char **argv) {
} }
} }
if (!sideload_auto_reboot && (status == INSTALL_ERROR || status == INSTALL_CORRUPT)) { if (status == INSTALL_ERROR || status == INSTALL_CORRUPT) {
copy_logs();
ui->SetBackground(RecoveryUI::ERROR); ui->SetBackground(RecoveryUI::ERROR);
if (!ui->IsTextVisible()) {
sleep(5);
}
} }
Device::BuiltinAction after = shutdown_after ? Device::SHUTDOWN : Device::REBOOT; Device::BuiltinAction after = shutdown_after ? Device::SHUTDOWN : Device::REBOOT;
if ((status != INSTALL_SUCCESS && status != INSTALL_SKIPPED && !sideload_auto_reboot) || // 1. If the recovery menu is visible, prompt and wait for commands.
ui->IsTextVisible()) { // 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); Device::BuiltinAction temp = prompt_and_wait(device, status);
if (temp != Device::NO_ACTION) { if (temp != Device::NO_ACTION) {
after = temp; after = temp;