Merge tag 'android-12.0.0_r7' into android-11
Android 12.0.0 release 7
Change-Id: Idbc61c74c1f983c7e8c7c9269059997eefefdc4d
diff --git a/install/wipe_data.cpp b/install/wipe_data.cpp
index b2da76b..845cc95 100755
--- a/install/wipe_data.cpp
+++ b/install/wipe_data.cpp
@@ -97,14 +97,19 @@
}
// ui->Print("\n-- Wiping cache...\n");
- bool success = EraseVolume("/cache", false);
- // ui->Print("Cache wipe %s.\n", success ? "complete" : "failed");
+ // 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;
}
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");