fixup! recovery: Add wipe system partition option
Change-Id: I8808bc49f1dcb5e3f6edb2a33a9eec65aa241068
diff --git a/install/include/install/wipe_data.h b/install/include/install/wipe_data.h
index 47a5a80..0890a4b 100644
--- a/install/include/install/wipe_data.h
+++ b/install/include/install/wipe_data.h
@@ -31,4 +31,5 @@
bool WipeData(Device* device, bool keep_memtag_mode = false, std::string_view new_fstype = "");
// Returns true on success.
-bool WipeSystem(RecoveryUI* ui, const std::function<bool()>& confirm);
+bool WipeSystem(RecoveryUI* ui, const std::function<bool()>& confirm,
+ std::string_view new_fstype = "");
diff --git a/install/wipe_data.cpp b/install/wipe_data.cpp
index b390a61..c85a8e0 100644
--- a/install/wipe_data.cpp
+++ b/install/wipe_data.cpp
@@ -172,13 +172,14 @@
return success;
}
-bool WipeSystem(RecoveryUI* ui, const std::function<bool()>& confirm_func) {
+bool WipeSystem(RecoveryUI* ui, const std::function<bool()>& confirm_func,
+ std::string_view new_fstype) {
if (confirm_func && !confirm_func()) {
return false;
}
ui->Print("\n-- Wiping system...\n");
- bool success = EraseVolume(android::fs_mgr::GetSystemRoot().c_str(), ui);
+ bool success = EraseVolume(android::fs_mgr::GetSystemRoot().c_str(), ui, new_fstype);
ui->Print("System wipe %s.\n", success ? "complete" : "failed");
return success;
}