diff options
| author | Tianjie Xu <xunchang@google.com> | 2020-03-13 14:25:02 -0700 |
|---|---|---|
| committer | Tianjie <xunchang@google.com> | 2020-03-18 13:46:49 -0700 |
| commit | e8ca1b86347992d3c92db8e7a25ee77a6280787b (patch) | |
| tree | 00ee997b3bfb0ea0243b38de336eec8593ac3f2c /recovery.cpp | |
| parent | 342e53d04535c36609344827fe939dc5e095e7e2 (diff) | |
Consolidate the wait in recovery's reboot
After a reboot function call, we should always wait for it to finish
without executing other instructions.
Bug: 151110322
Test: build
Change-Id: I1dda291a0835ff96df7eaf42eba1a38267a3beeb
(cherry picked from commit 00c4aba9bf428717fc00e26a03e97401eca76ee8)
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 0382697a..7675121d 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -781,13 +781,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 |