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

Merge "recovery: Track the name change for wipe_ab." into nyc-mr1-dev

Browse Source
This commit is contained in:
Tao Bao
2016-06-13 16:43:44 +00:00
committed by Android (Google) Code Review
parent dcf1089771 108ab21b21
commit dc1393d09b
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery.cpp
+12 -12
View File
@@ -83,7 +83,7 @@ static const struct option OPTIONS[] = {
{ "shutdown_after", no_argument, NULL, 'p' }, { "shutdown_after", no_argument, NULL, 'p' },
{ "reason", required_argument, NULL, 'r' }, { "reason", required_argument, NULL, 'r' },
{ "security", no_argument, NULL, 'e'}, { "security", no_argument, NULL, 'e'},
{ "brick", no_argument, NULL, 0 }, { "wipe_ab", no_argument, NULL, 0 },
{ NULL, 0, NULL, 0 }, { NULL, 0, NULL, 0 },
}; };
@@ -110,7 +110,7 @@ static const int BATTERY_READ_TIMEOUT_IN_SEC = 10;
// So we should check battery with a slightly lower limitation. // So we should check battery with a slightly lower limitation.
static const int BATTERY_OK_PERCENTAGE = 20; static const int BATTERY_OK_PERCENTAGE = 20;
static const int BATTERY_WITH_CHARGER_OK_PERCENTAGE = 15; static const int BATTERY_WITH_CHARGER_OK_PERCENTAGE = 15;
constexpr const char* RECOVERY_BRICK = "/etc/recovery.brick"; constexpr const char* RECOVERY_WIPE = "/etc/recovery.wipe";
RecoveryUI* ui = NULL; RecoveryUI* ui = NULL;
static const char* locale = "en_US"; static const char* locale = "en_US";
@@ -904,15 +904,15 @@ static bool secure_wipe_partition(const std::string& partition) {
return true; return true;
} }
// Brick the current device, with a secure wipe of all the partitions in // Wipe the current A/B device, with a secure wipe of all the partitions in
// RECOVERY_BRICK. // RECOVERY_WIPE.
static bool brick_device() { static bool wipe_ab_device() {
ui->SetBackground(RecoveryUI::ERASING); ui->SetBackground(RecoveryUI::ERASING);
ui->SetProgressType(RecoveryUI::INDETERMINATE); ui->SetProgressType(RecoveryUI::INDETERMINATE);
std::string partition_list; std::string partition_list;
if (!android::base::ReadFileToString(RECOVERY_BRICK, &partition_list)) { if (!android::base::ReadFileToString(RECOVERY_WIPE, &partition_list)) {
LOGE("failed to read \"%s\".\n", RECOVERY_BRICK); LOGE("failed to read \"%s\".\n", RECOVERY_WIPE);
return false; return false;
} }
@@ -1417,7 +1417,7 @@ int main(int argc, char **argv) {
const char *update_package = NULL; const char *update_package = NULL;
bool should_wipe_data = false; bool should_wipe_data = false;
bool should_wipe_cache = false; bool should_wipe_cache = false;
bool should_brick = false; bool should_wipe_ab = false;
bool show_text = false; bool show_text = false;
bool sideload = false; bool sideload = false;
bool sideload_auto_reboot = false; bool sideload_auto_reboot = false;
@@ -1452,8 +1452,8 @@ int main(int argc, char **argv) {
case 'r': reason = optarg; break; case 'r': reason = optarg; break;
case 'e': security_update = true; break; case 'e': security_update = true; break;
case 0: { case 0: {
if (strcmp(OPTIONS[option_index].name, "brick") == 0) { if (strcmp(OPTIONS[option_index].name, "wipe_ab") == 0) {
should_brick = true; should_wipe_ab = true;
break; break;
} }
break; break;
@@ -1596,8 +1596,8 @@ int main(int argc, char **argv) {
if (!wipe_cache(false, device)) { if (!wipe_cache(false, device)) {
status = INSTALL_ERROR; status = INSTALL_ERROR;
} }
} else if (should_brick) { } else if (should_wipe_ab) {
if (!brick_device()) { if (!wipe_ab_device()) {
status = INSTALL_ERROR; status = INSTALL_ERROR;
} }
} else if (sideload) { } else if (sideload) {