Merge "Fix sticky rescue party boot" into main am: 17833ea655
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3027135 Change-Id: I8b93c6a8a9c5c1d425cbcdc47e49779488b3b7f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
0b4928ea8f
1 changed files with 5 additions and 0 deletions
|
@ -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. "
|
||||
|
|
Loading…
Reference in a new issue