summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2022-03-18 00:21:22 +0100
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-18 00:21:22 +0100
commit64640dd7f7a4fe19ad52c4d6d26a516319dfbf07 (patch)
treef3f1c6af46f810634d33b81baff8988993c316d5 /recovery.cpp
parent[automerger skipped] Merge "Merge Android 12L" am: 6e1dcc84bd -s ours am: 8f26d0a018 -s ours am: ab6fc1a11b -s ours am: 3637c83b14 -s ours am: 9f42afd718 -s ours (diff)
parentMerge "Remove support for converting from FDE to FBE" am: 37a4f4d243 am: a062eda2e8 am: 41475f64f7 (diff)
downloadandroid_bootable_recovery-64640dd7f7a4fe19ad52c4d6d26a516319dfbf07.tar
android_bootable_recovery-64640dd7f7a4fe19ad52c4d6d26a516319dfbf07.tar.gz
android_bootable_recovery-64640dd7f7a4fe19ad52c4d6d26a516319dfbf07.tar.bz2
android_bootable_recovery-64640dd7f7a4fe19ad52c4d6d26a516319dfbf07.tar.lz
android_bootable_recovery-64640dd7f7a4fe19ad52c4d6d26a516319dfbf07.tar.xz
android_bootable_recovery-64640dd7f7a4fe19ad52c4d6d26a516319dfbf07.tar.zst
android_bootable_recovery-64640dd7f7a4fe19ad52c4d6d26a516319dfbf07.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) {