Merge "Fix wipe from android settings for devices with /datadata" into ics

This commit is contained in:
Steve Kondik 2011-11-30 08:14:02 +03:00 committed by Gerrit Code Review
commit db524c28b4

View File

@ -867,6 +867,7 @@ main(int argc, char **argv) {
} else if (wipe_data) {
if (device_wipe_data()) status = INSTALL_ERROR;
if (erase_volume("/data")) status = INSTALL_ERROR;
if (has_datadata() && erase_volume("/datadata")) status = INSTALL_ERROR;
if (wipe_cache && erase_volume("/cache")) status = INSTALL_ERROR;
if (status != INSTALL_SUCCESS) ui_print("Data wipe failed.\n");
} else if (wipe_cache) {