summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-14 23:54:25 +0100
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-14 23:54:25 +0100
commit737a2e41bde4581bbbe12c3f54eed4d55d15c7e6 (patch)
tree8651cb90295a8fa07e968c8e584e72f1b9d2a104 /recovery.cpp
parentMerge "recovery: Remove HOST_OS guard for f2fs tools" am: 95101e7fca (diff)
parentMerge "Consolidate the wait in recovery's reboot" (diff)
downloadandroid_bootable_recovery-737a2e41bde4581bbbe12c3f54eed4d55d15c7e6.tar
android_bootable_recovery-737a2e41bde4581bbbe12c3f54eed4d55d15c7e6.tar.gz
android_bootable_recovery-737a2e41bde4581bbbe12c3f54eed4d55d15c7e6.tar.bz2
android_bootable_recovery-737a2e41bde4581bbbe12c3f54eed4d55d15c7e6.tar.lz
android_bootable_recovery-737a2e41bde4581bbbe12c3f54eed4d55d15c7e6.tar.xz
android_bootable_recovery-737a2e41bde4581bbbe12c3f54eed4d55d15c7e6.tar.zst
android_bootable_recovery-737a2e41bde4581bbbe12c3f54eed4d55d15c7e6.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 9ea616e13..b1f106b1c 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -783,13 +783,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
ui->Print("Retry attempt %d\n", retry_count);
// Reboot back into recovery to retry the update.
- if (!Reboot("recovery")) {
- ui->Print("Reboot failed\n");
- } else {
- while (true) {
- pause();
- }
- }
+ Reboot("recovery");
}
// If this is an eng or userdebug build, then automatically
// turn the text display on if the script fails so the error