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/common/fake_hardware.h b/common/fake_hardware.h
index 6c25183..3b68958 100644
--- a/common/fake_hardware.h
+++ b/common/fake_hardware.h
@@ -107,15 +107,13 @@
int GetPowerwashCount() const override { return powerwash_count_; }
- bool SchedulePowerwash(bool save_rollback_data) override {
+ bool SchedulePowerwash() override {
powerwash_scheduled_ = true;
- save_rollback_data_ = save_rollback_data;
return true;
}
bool CancelPowerwash() override {
powerwash_scheduled_ = false;
- save_rollback_data_ = false;
return true;
}
diff --git a/common/hardware_interface.h b/common/hardware_interface.h
index 4e820f1..1b146d1 100644
--- a/common/hardware_interface.h
+++ b/common/hardware_interface.h
@@ -100,9 +100,8 @@
virtual int GetPowerwashCount() const = 0;
// Signals that a powerwash (stateful partition wipe) should be performed
- // after reboot. If |save_rollback_data| is true additional state is
- // preserved during shutdown that can be restored after the powerwash.
- virtual bool SchedulePowerwash(bool save_rollback_data) = 0;
+ // after reboot.
+ virtual bool SchedulePowerwash() = 0;
// Cancel the powerwash operation scheduled to be performed on next boot.
virtual bool CancelPowerwash() = 0;
diff --git a/common/test_utils.h b/common/test_utils.h
index b85f80d..2a582b1 100644
--- a/common/test_utils.h
+++ b/common/test_utils.h
@@ -175,7 +175,7 @@
// This is a simple Action class for testing. It feeds an object into
// another action.
template <typename T>
-class ObjectFeederAction : public Action<ObjectFeederAction<T>> {
+class ObjectFeederAction final : public Action<ObjectFeederAction<T>> {
public:
typedef NoneType InputObjectType;
typedef T OutputObjectType;