diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-14 23:04:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-14 23:04:41 +0000 |
| commit | 07e1577a3e83395d3eac26733192463a1b889ad1 (patch) | |
| tree | cc6b80bb25b9227d561b02dd34714722df731f08 /recovery.cpp | |
| parent | 461e6ee7e43f6a91265616357af717097be57a49 (diff) | |
| parent | 737a2e41bde4581bbbe12c3f54eed4d55d15c7e6 (diff) | |
Merge "Consolidate the wait in recovery's reboot" am: a69c69b26f am: 737a2e41bd
Change-Id: I31c2402def47126ba364ef44b9c2fe5effc3ca94
Diffstat (limited to 'recovery.cpp')
| -rw-r--r-- | recovery.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/recovery.cpp b/recovery.cpp index 526e1a55..b0220276 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -787,13 +787,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 |