summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2022-03-10 23:13:39 +0100
committerEric Biggers <ebiggers@google.com>2022-03-10 23:48:49 +0100
commitfde69fbd8ab174dbc9f828785c435a7d52311386 (patch)
tree2a0820b1c0944841852af90638b80e1b7cc16ee6 /recovery.cpp
parentMerge "Merge Android 12L" (diff)
downloadandroid_bootable_recovery-fde69fbd8ab174dbc9f828785c435a7d52311386.tar
android_bootable_recovery-fde69fbd8ab174dbc9f828785c435a7d52311386.tar.gz
android_bootable_recovery-fde69fbd8ab174dbc9f828785c435a7d52311386.tar.bz2
android_bootable_recovery-fde69fbd8ab174dbc9f828785c435a7d52311386.tar.lz
android_bootable_recovery-fde69fbd8ab174dbc9f828785c435a7d52311386.tar.xz
android_bootable_recovery-fde69fbd8ab174dbc9f828785c435a7d52311386.tar.zst
android_bootable_recovery-fde69fbd8ab174dbc9f828785c435a7d52311386.zip
Diffstat (limited to '')
-rw-r--r--recovery.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 0c977c361..4d3901959 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -207,8 +207,7 @@ static InstallResult prompt_and_wipe_data(Device* device) {
if (ask_to_wipe_data(device)) {
CHECK(device->GetReason().has_value());
- bool convert_fbe = device->GetReason().value() == "convert_fbe";
- if (WipeData(device, convert_fbe)) {
+ if (WipeData(device)) {
return INSTALL_SUCCESS;
} else {
return INSTALL_ERROR;
@@ -437,10 +436,10 @@ static Device::BuiltinAction PromptAndWait(Device* device, InstallResult status)
save_current_log = true;
if (ui->IsTextVisible()) {
if (ask_to_wipe_data(device)) {
- WipeData(device, false);
+ WipeData(device);
}
} else {
- WipeData(device, false);
+ WipeData(device);
return Device::NO_ACTION;
}
break;
@@ -794,8 +793,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
} else if (should_wipe_data) {
save_current_log = true;
CHECK(device->GetReason().has_value());
- bool convert_fbe = device->GetReason().value() == "convert_fbe";
- if (!WipeData(device, convert_fbe)) {
+ if (!WipeData(device)) {
status = INSTALL_ERROR;
}
} else if (should_prompt_and_wipe_data) {