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

Commit b845427d authored by Tianjie Xu's avatar Tianjie Xu Committed by Automerger Merge Worker
Browse files

Merge "Bring up the erase animation early for data wipe" am: 8082b71f 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18db841d673928dbefe97142cbdafd6f4c61db51
parents fc8f576c 8082b71f

install/wipe_data.cpp

+5 −3
Original line number Diff line number Diff line
@@ -41,9 +41,6 @@ static bool EraseVolume(const char* volume, RecoveryUI* ui, bool convert_fbe) { 
  bool is_cache = (strcmp(volume, CACHE_ROOT) == 0);

  bool is_data = (strcmp(volume, DATA_ROOT) == 0);



  ui->SetBackground(RecoveryUI::ERASING);

  ui->SetProgressType(RecoveryUI::INDETERMINATE);



  std::vector<saved_log_file> log_files;

  if (is_cache) {

    // If we're reformatting /cache, we load any past logs (i.e. "/cache/recovery/last_*") and the
@@ -97,6 +94,9 @@ bool WipeCache(RecoveryUI* ui, const std::function<bool()>& confirm_func) { 
  }



  ui->Print("\n-- Wiping cache...\n");

  ui->SetBackground(RecoveryUI::ERASING);

  ui->SetProgressType(RecoveryUI::INDETERMINATE);



  bool success = EraseVolume("/cache", ui, false);

  ui->Print("Cache wipe %s.\n", success ? "complete" : "failed");

  return success;
@@ -105,6 +105,8 @@ bool WipeCache(RecoveryUI* ui, const std::function<bool()>& confirm_func) { 
bool WipeData(Device* device, bool convert_fbe) {

  RecoveryUI* ui = device->GetUI();

  ui->Print("\n-- Wiping data...\n");

  ui->SetBackground(RecoveryUI::ERASING);

  ui->SetProgressType(RecoveryUI::INDETERMINATE);



  if (!FinishPendingSnapshotMerges(device)) {

    ui->Print("Unable to check update status or complete merge, cannot wipe partitions.\n");