diff options
| author | Paul Crowley <paulcrowley@google.com> | 2018-04-25 05:03:05 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-25 05:03:05 +0200 |
| commit | 486dc73135bd22ef7e6805dcee930e22a8511916 (patch) | |
| tree | cc62dfe270c6a3ef015f2be0c02cf88360e25fbe | |
| parent | Merge "Dump debug information for apply_patch unit tests" am: fe527cced4 am: 943c2057ad (diff) | |
| parent | Merge "Wipe the metadata partition when we wipe data." am: 897385bfe2 (diff) | |
| download | android_bootable_recovery-486dc73135bd22ef7e6805dcee930e22a8511916.tar android_bootable_recovery-486dc73135bd22ef7e6805dcee930e22a8511916.tar.gz android_bootable_recovery-486dc73135bd22ef7e6805dcee930e22a8511916.tar.bz2 android_bootable_recovery-486dc73135bd22ef7e6805dcee930e22a8511916.tar.lz android_bootable_recovery-486dc73135bd22ef7e6805dcee930e22a8511916.tar.xz android_bootable_recovery-486dc73135bd22ef7e6805dcee930e22a8511916.tar.zst android_bootable_recovery-486dc73135bd22ef7e6805dcee930e22a8511916.zip | |
| -rw-r--r-- | recovery.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/recovery.cpp b/recovery.cpp index e266d9312..15af9f05a 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -108,6 +108,7 @@ static const char *CONVERT_FBE_DIR = "/tmp/convert_fbe"; static const char *CONVERT_FBE_FILE = "/tmp/convert_fbe/convert_fbe"; static const char *CACHE_ROOT = "/cache"; static const char *DATA_ROOT = "/data"; +static const char* METADATA_ROOT = "/metadata"; static const char *SDCARD_ROOT = "/sdcard"; static const char *TEMPORARY_LOG_FILE = "/tmp/recovery.log"; static const char *TEMPORARY_INSTALL_FILE = "/tmp/last_install"; @@ -752,11 +753,19 @@ static bool wipe_data(Device* device) { modified_flash = true; ui->Print("\n-- Wiping data...\n"); - bool success = - device->PreWipeData() && - erase_volume("/data") && - (has_cache ? erase_volume("/cache") : true) && - device->PostWipeData(); + bool success = device->PreWipeData(); + if (success) { + success &= erase_volume(DATA_ROOT); + if (has_cache) { + success &= erase_volume(CACHE_ROOT); + } + if (volume_for_mount_point(METADATA_ROOT) != nullptr) { + success &= erase_volume(METADATA_ROOT); + } + } + if (success) { + success &= device->PostWipeData(); + } ui->Print("Data wipe %s.\n", success ? "complete" : "failed"); return success; } |