Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63e31280 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix sticky rescue party boot" into main am: 17833ea6 am: 0b4928ea 

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



Change-Id: Ibaf818acf0cf68ed8a9d5ed385c93e704d74b3da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ed3eed0 0b4928ea

recovery.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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. "