diff options
author | Andres Morales <anmorales@google.com> | 2015-03-30 20:56:57 +0000 |
---|---|---|
committer | Tao Bao <tbao@google.com> | 2015-03-31 09:48:50 -0700 |
commit | c277762de13653f73451e1a21fe73eafc51f918e (patch) | |
tree | 2dfb0dec13b9285f209d32e7f6d7a1436743c0cc /recovery.cpp | |
parent | 20e82d4fb6b4ba8520bd46db2982495f0b627ed1 (diff) | |
download | bootable_recovery-c277762de13653f73451e1a21fe73eafc51f918e.tar.gz bootable_recovery-c277762de13653f73451e1a21fe73eafc51f918e.tar.bz2 bootable_recovery-c277762de13653f73451e1a21fe73eafc51f918e.zip |
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 ee19387905650cab5da7dd97ada5502cd17ac93d.
Bug: 19967123
Change-Id: I2a977cb0f0ba94defa1bf9091219398ddc1d3528
(cherry picked from commit 037444642bc32d8fed3bb996823b6a62faa57195)
Diffstat (limited to 'recovery.cpp')
-rw-r--r-- | recovery.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/recovery.cpp b/recovery.cpp index a390c8a..4e43e83 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -695,7 +695,6 @@ static void wipe_data(int confirm, Device* device) { device->WipeData(); erase_volume("/data"); erase_volume("/cache"); - erase_persistent_partition(); ui->Print("Data wipe complete.\n"); } @@ -1102,7 +1101,6 @@ main(int argc, char **argv) { if (device->WipeData()) status = INSTALL_ERROR; if (erase_volume("/data")) status = INSTALL_ERROR; if (should_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 (should_wipe_cache) { if (should_wipe_cache && erase_volume("/cache")) status = INSTALL_ERROR; |