Merge "Fix sticky rescue party boot" into main am: 17833ea655 am: 0b4928ea8f

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3027135

Change-Id: Ibaf818acf0cf68ed8a9d5ed385c93e704d74b3da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-04-05 19:36:03 +00:00 committed by Automerger Merge Worker
commit 63e3128023

View file

@ -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. "