summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-18 04:00:57 +0100
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-18 04:00:57 +0100
commitad249270bdfca03ed7d49dcc15a469bb4e24eb53 (patch)
treef3f1c6af46f810634d33b81baff8988993c316d5 /recovery.cpp
parentSnap for 8282595 from fd88659f9c50030fb514ab397b6215c82697b6c2 to udc-release (diff)
parentMerge "Remove support for converting from FDE to FBE" am: 37a4f4d243 am: a062eda2e8 am: 41475f64f7 am: 277904c1fe am: 2ff4316b7e (diff)
downloadandroid_bootable_recovery-ad249270bdfca03ed7d49dcc15a469bb4e24eb53.tar
android_bootable_recovery-ad249270bdfca03ed7d49dcc15a469bb4e24eb53.tar.gz
android_bootable_recovery-ad249270bdfca03ed7d49dcc15a469bb4e24eb53.tar.bz2
android_bootable_recovery-ad249270bdfca03ed7d49dcc15a469bb4e24eb53.tar.lz
android_bootable_recovery-ad249270bdfca03ed7d49dcc15a469bb4e24eb53.tar.xz
android_bootable_recovery-ad249270bdfca03ed7d49dcc15a469bb4e24eb53.tar.zst
android_bootable_recovery-ad249270bdfca03ed7d49dcc15a469bb4e24eb53.zip
Diffstat (limited to 'recovery.cpp')
-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) {