diff options
| author | Eric Biggers <ebiggers@google.com> | 2022-03-17 23:19:14 +0100 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-17 23:19:14 +0100 |
| commit | a062eda2e8f6a36104746b20ef24443cd6533133 (patch) | |
| tree | 2a0820b1c0944841852af90638b80e1b7cc16ee6 /recovery.cpp | |
| parent | [automerger skipped] Merge "Merge Android 12L" am: 6e1dcc84bd -s ours (diff) | |
| parent | Merge "Remove support for converting from FDE to FBE" (diff) | |
| download | android_bootable_recovery-a062eda2e8f6a36104746b20ef24443cd6533133.tar android_bootable_recovery-a062eda2e8f6a36104746b20ef24443cd6533133.tar.gz android_bootable_recovery-a062eda2e8f6a36104746b20ef24443cd6533133.tar.bz2 android_bootable_recovery-a062eda2e8f6a36104746b20ef24443cd6533133.tar.lz android_bootable_recovery-a062eda2e8f6a36104746b20ef24443cd6533133.tar.xz android_bootable_recovery-a062eda2e8f6a36104746b20ef24443cd6533133.tar.zst android_bootable_recovery-a062eda2e8f6a36104746b20ef24443cd6533133.zip | |
Diffstat (limited to 'recovery.cpp')
| -rw-r--r-- | recovery.cpp | 10 |
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) { |