DO NOT MERGE Revert "Erase PST partition if its marked to be erased."
This now gets done at the framework level. Doing it here breaks the signature on the partition.
This reverts commit ee19387905.
Bug: 19967123
Change-Id: I447b926b733ca145f11a916d9569ce39889db627
This commit is contained in:
@@ -716,7 +716,6 @@ wipe_data(int confirm, Device* device) {
|
||||
device->WipeData();
|
||||
erase_volume("/data");
|
||||
erase_volume("/cache");
|
||||
erase_persistent_partition();
|
||||
ui->Print("Data wipe complete.\n");
|
||||
}
|
||||
|
||||
@@ -1122,7 +1121,6 @@ main(int argc, char **argv) {
|
||||
if (device->WipeData()) status = INSTALL_ERROR;
|
||||
if (erase_volume("/data")) status = INSTALL_ERROR;
|
||||
if (wipe_cache && erase_volume("/cache")) status = INSTALL_ERROR;
|
||||
if (erase_persistent_partition() == -1 ) status = INSTALL_ERROR;
|
||||
if (status != INSTALL_SUCCESS) ui->Print("Data wipe failed.\n");
|
||||
} else if (wipe_cache) {
|
||||
if (wipe_cache && erase_volume("/cache")) status = INSTALL_ERROR;
|
||||
|
||||
Reference in New Issue
Block a user