diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-05 18:58:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-05 18:58:54 +0000 |
| commit | 17833ea655def06ad28b9d6af78c868d7fcdfacf (patch) | |
| tree | 70df052cb5e2fb37258b092756319b9e740be376 | |
| parent | e288aff6fa50477091c5f71fdc641aa8672d3e77 (diff) | |
| parent | c031e9d3d1c05896f2792eb0b749ab995f45fa35 (diff) | |
| download | recovery-17833ea655def06ad28b9d6af78c868d7fcdfacf.tar.gz | |
Merge "Fix sticky rescue party boot" into main
| -rw-r--r-- | recovery.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/recovery.cpp b/recovery.cpp index e7a33a9e..fbfe6468 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -176,6 +176,11 @@ static bool ask_to_wipe_data(Device* device) { } static InstallResult prompt_and_wipe_data(Device* device) { + // Reset to normal system boot so recovery won't cycle indefinitely. + std::string err; + if (!clear_bootloader_message(&err)) { + LOG(ERROR) << "Failed to clear BCB message: " << err; + } // Use a single string and let ScreenRecoveryUI handles the wrapping. std::vector<std::string> wipe_data_menu_headers{ "Can't load Android system. Your data may be corrupt. " |