PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Wipe the metadata partition when we wipe data."

Browse Source
This commit is contained in:
Treehugger Robot
2018-04-25 02:38:11 +00:00
committed by Gerrit Code Review
parent fe527cced4 3b4d516151
commit 897385bfe2
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery.cpp
+14 -5
View File
@@ -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 *CONVERT_FBE_FILE = "/tmp/convert_fbe/convert_fbe";
static const char *CACHE_ROOT = "/cache"; static const char *CACHE_ROOT = "/cache";
static const char *DATA_ROOT = "/data"; static const char *DATA_ROOT = "/data";
static const char* METADATA_ROOT = "/metadata";
static const char *SDCARD_ROOT = "/sdcard"; static const char *SDCARD_ROOT = "/sdcard";
static const char *TEMPORARY_LOG_FILE = "/tmp/recovery.log"; static const char *TEMPORARY_LOG_FILE = "/tmp/recovery.log";
static const char *TEMPORARY_INSTALL_FILE = "/tmp/last_install"; static const char *TEMPORARY_INSTALL_FILE = "/tmp/last_install";
@@ -752,11 +753,19 @@ static bool wipe_data(Device* device) {
modified_flash = true; modified_flash = true;
ui->Print("\n-- Wiping data...\n"); ui->Print("\n-- Wiping data...\n");
bool success = bool success = device->PreWipeData();
device->PreWipeData() && if (success) {
erase_volume("/data") && success &= erase_volume(DATA_ROOT);
(has_cache ? erase_volume("/cache") : true) && if (has_cache) {
device->PostWipeData(); 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"); ui->Print("Data wipe %s.\n", success ? "complete" : "failed");
return success; return success;
} }