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

Commit c031e9d3 authored by Kelvin Zhang's avatar Kelvin Zhang
Browse files

Fix sticky rescue party boot 

When entering recovery via rescue party, recovery does not call
FinishRecovery() to reset BCB. This causes the rescue party command to
stick, and device keeps rebooting into rescue party mode after entering
bootloader mode and reboot.

Test: enter rescue party, reboot bootloader, fastboot reboot
Bug: 332621855
Change-Id: I958a77ccb2433d76aecb44f8c6f8fedebe08bbe0
parent e366fe9f

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