Remove unused field save_rollback_data
save_rollback_data is inherited from ChromeOS to persist data
after a data wipe. Android never supported this feature, remove
unused code.
Test: th
Bug: 377557752
Change-Id: I022577bb19cd27010ffe0236b2659fe7880f03c4
diff --git a/aosp/hardware_android.cc b/aosp/hardware_android.cc
index 29d742f..dd39fdd 100644
--- a/aosp/hardware_android.cc
+++ b/aosp/hardware_android.cc
@@ -213,10 +213,8 @@
return 0;
}
-bool HardwareAndroid::SchedulePowerwash(bool save_rollback_data) {
+bool HardwareAndroid::SchedulePowerwash() {
LOG(INFO) << "Scheduling a powerwash to BCB.";
- LOG_IF(WARNING, save_rollback_data) << "save_rollback_data was true but "
- << "isn't supported.";
string err;
if (!update_bootloader_message({"--wipe_data", "--reason=wipe_data_from_ota"},
&err)) {
diff --git a/aosp/hardware_android.h b/aosp/hardware_android.h
index cb655c9..b071e06 100644
--- a/aosp/hardware_android.h
+++ b/aosp/hardware_android.h
@@ -18,13 +18,11 @@
#define UPDATE_ENGINE_AOSP_HARDWARE_ANDROID_H_
#include <string>
-#include <string_view>
#include <android-base/macros.h>
#include <base/time/time.h>
#include "update_engine/common/error_code.h"
-#include "update_engine/common/hardware.h"
#include "update_engine/common/hardware_interface.h"
namespace chromeos_update_engine {
@@ -49,7 +47,7 @@
bool SetMaxFirmwareKeyRollforward(int firmware_max_rollforward) override;
bool SetMaxKernelKeyRollforward(int kernel_max_rollforward) override;
int GetPowerwashCount() const override;
- bool SchedulePowerwash(bool save_rollback_data) override;
+ bool SchedulePowerwash() override;
bool CancelPowerwash() override;
bool GetNonVolatileDirectory(base::FilePath* path) const override;
bool GetPowerwashSafeDirectory(base::FilePath* path) const override;