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

am ccc82eca: Merge "Refactor the codes to call wipe_data/wipe_cache functions"

Browse Source 
* commit 'ccc82eca9a9b63f43c69472c0841954f19f7a7f0':
  Refactor the codes to call wipe_data/wipe_cache functions
This commit is contained in:
Tao Bao
2015-04-01 01:27:36 +00:00
committed by Android Git Automerger
parent 9e1bba1f5f ccc82eca9a
commit 8cd389c805
1 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery.cpp
+36 -22
View File
@@ -686,26 +686,36 @@ static bool yes_no(Device* device, const char* question1, const char* question2)
return (chosen_item == 1); return (chosen_item == 1);
} }
static void wipe_data(int confirm, Device* device) { // Return true on success.
if (confirm && !yes_no(device, "Wipe all user data?", " THIS CAN NOT BE UNDONE!")) { static bool wipe_data(int should_confirm, Device* device) {
return; if (should_confirm && !yes_no(device, "Wipe all user data?", " THIS CAN NOT BE UNDONE!")) {
return false;
} }
ui->Print("\n-- Wiping data...\n"); ui->Print("\n-- Wiping data...\n");
device->WipeData(); if (device->WipeData() == 0 && erase_volume("/data") == 0 && erase_volume("/cache") == 0) {
erase_volume("/data"); ui->Print("Data wipe complete.\n");
erase_volume("/cache"); return true;
ui->Print("Data wipe complete.\n"); } else {
ui->Print("Data wipe failed.\n");
return false;
}
} }
static void wipe_cache(bool should_confirm, Device* device) { // Return true on success.
static bool wipe_cache(bool should_confirm, Device* device) {
if (should_confirm && !yes_no(device, "Wipe cache?", " THIS CAN NOT BE UNDONE!")) { if (should_confirm && !yes_no(device, "Wipe cache?", " THIS CAN NOT BE UNDONE!")) {
return; return false;
} }
ui->Print("\n-- Wiping cache...\n"); ui->Print("\n-- Wiping cache...\n");
erase_volume("/cache"); if (erase_volume("/cache") == 0) {
ui->Print("Cache wipe complete.\n"); ui->Print("Cache wipe complete.\n");
return true;
} else {
ui->Print("Cache wipe failed.\n");
return false;
}
} }
static void file_to_ui(const char* fn) { static void file_to_ui(const char* fn) {
@@ -889,7 +899,9 @@ prompt_and_wait(Device* device, int status) {
} }
if (status == INSTALL_SUCCESS && should_wipe_cache) { if (status == INSTALL_SUCCESS && should_wipe_cache) {
wipe_cache(false, device); if (!wipe_cache(false, device)) {
status = INSTALL_ERROR;
}
} }
if (status != INSTALL_SUCCESS) { if (status != INSTALL_SUCCESS) {
@@ -984,7 +996,7 @@ main(int argc, char **argv) {
const char *send_intent = NULL; const char *send_intent = NULL;
const char *update_package = NULL; const char *update_package = NULL;
bool wipe_data = false; bool should_wipe_data = false;
bool should_wipe_cache = false; bool should_wipe_cache = false;
bool show_text = false; bool show_text = false;
bool sideload = false; bool sideload = false;
@@ -997,7 +1009,7 @@ main(int argc, char **argv) {
switch (arg) { switch (arg) {
case 'i': send_intent = optarg; break; case 'i': send_intent = optarg; break;
case 'u': update_package = optarg; break; case 'u': update_package = optarg; break;
case 'w': wipe_data = true; should_wipe_cache = true; break; case 'w': should_wipe_data = true; break;
case 'c': should_wipe_cache = true; break; case 'c': should_wipe_cache = true; break;
case 't': show_text = true; break; case 't': show_text = true; break;
case 's': sideload = true; break; case 's': sideload = true; break;
@@ -1097,14 +1109,14 @@ main(int argc, char **argv) {
ui->ShowText(true); ui->ShowText(true);
} }
} }
} else if (wipe_data) { } else if (should_wipe_data) {
if (device->WipeData()) status = INSTALL_ERROR; if (!wipe_data(false, device)) {
if (erase_volume("/data")) status = INSTALL_ERROR; status = INSTALL_ERROR;
if (should_wipe_cache && erase_volume("/cache")) status = INSTALL_ERROR; }
if (status != INSTALL_SUCCESS) ui->Print("Data wipe failed.\n");
} else if (should_wipe_cache) { } else if (should_wipe_cache) {
if (should_wipe_cache && erase_volume("/cache")) status = INSTALL_ERROR; if (!wipe_cache(false, device)) {
if (status != INSTALL_SUCCESS) ui->Print("Cache wipe failed.\n"); status = INSTALL_ERROR;
}
} else if (sideload) { } else if (sideload) {
// 'adb reboot sideload' acts the same as user presses key combinations // 'adb reboot sideload' acts the same as user presses key combinations
// to enter the sideload mode. When 'sideload-auto-reboot' is used, text // to enter the sideload mode. When 'sideload-auto-reboot' is used, text
@@ -1117,7 +1129,9 @@ main(int argc, char **argv) {
} }
status = apply_from_adb(ui, &should_wipe_cache, TEMPORARY_INSTALL_FILE); status = apply_from_adb(ui, &should_wipe_cache, TEMPORARY_INSTALL_FILE);
if (status == INSTALL_SUCCESS && should_wipe_cache) { if (status == INSTALL_SUCCESS && should_wipe_cache) {
wipe_cache(false, device); if (!wipe_cache(false, device)) {
status = INSTALL_ERROR;
}
} }
ui->Print("\nInstall from ADB complete (status: %d).\n", status); ui->Print("\nInstall from ADB complete (status: %d).\n", status);
if (sideload_auto_reboot) { if (sideload_auto_reboot) {