diff options
| author | Tianjie Xu <xunchang@google.com> | 2021-03-11 07:26:21 +0100 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-11 07:26:21 +0100 |
| commit | 4a3144a6ae3c15f1a49d2affbbc97276f2c6d159 (patch) | |
| tree | 7b0c703e8b7c95805cb75262ece2be0a8df94a05 | |
| parent | [automerger skipped] Merge "Merge RQ2A.210305.007" am: a952c55faf -s ours am: fc8f576c00 -s ours (diff) | |
| parent | Merge "Bring up the erase animation early for data wipe" am: 8082b71f45 (diff) | |
| download | android_bootable_recovery-4a3144a6ae3c15f1a49d2affbbc97276f2c6d159.tar android_bootable_recovery-4a3144a6ae3c15f1a49d2affbbc97276f2c6d159.tar.gz android_bootable_recovery-4a3144a6ae3c15f1a49d2affbbc97276f2c6d159.tar.bz2 android_bootable_recovery-4a3144a6ae3c15f1a49d2affbbc97276f2c6d159.tar.lz android_bootable_recovery-4a3144a6ae3c15f1a49d2affbbc97276f2c6d159.tar.xz android_bootable_recovery-4a3144a6ae3c15f1a49d2affbbc97276f2c6d159.tar.zst android_bootable_recovery-4a3144a6ae3c15f1a49d2affbbc97276f2c6d159.zip | |
| -rw-r--r-- | install/wipe_data.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/install/wipe_data.cpp b/install/wipe_data.cpp index 287208583..4eecf72c6 100644 --- a/install/wipe_data.cpp +++ b/install/wipe_data.cpp @@ -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"); |