diff options
| author | David Anderson <dvander@google.com> | 2019-11-15 05:27:59 +0100 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-15 05:27:59 +0100 |
| commit | 8444dec7ac22f6876651110b2ec831032ed875fd (patch) | |
| tree | 5290b76f3706c975c366899419907f885c2f7075 /install/wipe_data.cpp | |
| parent | Merge "Consolidate the vendor space misc usage for Pixels" (diff) | |
| parent | Force merges to complete before wiping data or metadata. (diff) | |
| download | android_bootable_recovery-8444dec7ac22f6876651110b2ec831032ed875fd.tar android_bootable_recovery-8444dec7ac22f6876651110b2ec831032ed875fd.tar.gz android_bootable_recovery-8444dec7ac22f6876651110b2ec831032ed875fd.tar.bz2 android_bootable_recovery-8444dec7ac22f6876651110b2ec831032ed875fd.tar.lz android_bootable_recovery-8444dec7ac22f6876651110b2ec831032ed875fd.tar.xz android_bootable_recovery-8444dec7ac22f6876651110b2ec831032ed875fd.tar.zst android_bootable_recovery-8444dec7ac22f6876651110b2ec831032ed875fd.zip | |
Diffstat (limited to 'install/wipe_data.cpp')
| -rw-r--r-- | install/wipe_data.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/install/wipe_data.cpp b/install/wipe_data.cpp index 82660bef0..287208583 100644 --- a/install/wipe_data.cpp +++ b/install/wipe_data.cpp @@ -27,6 +27,7 @@ #include <android-base/logging.h> #include <android-base/stringprintf.h> +#include "install/snapshot_utils.h" #include "otautil/dirutil.h" #include "recovery_ui/ui.h" #include "recovery_utils/logging.h" @@ -104,6 +105,12 @@ 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"); + + if (!FinishPendingSnapshotMerges(device)) { + ui->Print("Unable to check update status or complete merge, cannot wipe partitions.\n"); + return false; + } + bool success = device->PreWipeData(); if (success) { success &= EraseVolume(DATA_ROOT, ui, convert_fbe); |