diff options
| -rw-r--r-- | boot_control_android.cc | 4 | ||||
| -rw-r--r-- | boot_control_android.h | 1 | ||||
| -rw-r--r-- | boot_control_chromeos.cc | 2 | ||||
| -rw-r--r-- | boot_control_chromeos.h | 1 | ||||
| -rw-r--r-- | common/boot_control_interface.h | 3 | ||||
| -rw-r--r-- | common/boot_control_stub.cc | 4 | ||||
| -rw-r--r-- | common/boot_control_stub.h | 1 | ||||
| -rw-r--r-- | common/fake_boot_control.h | 2 | ||||
| -rw-r--r-- | update_attempter_android.cc | 2 |
9 files changed, 1 insertions, 19 deletions
diff --git a/boot_control_android.cc b/boot_control_android.cc index 43b2c594..9f736b7e 100644 --- a/boot_control_android.cc +++ b/boot_control_android.cc @@ -74,10 +74,6 @@ bool BootControlAndroid::Init() { return true; } -void BootControlAndroid::Cleanup() { - dynamic_control_->Cleanup(); -} - unsigned int BootControlAndroid::GetNumSlots() const { return module_->getNumberSlots(); } diff --git a/boot_control_android.h b/boot_control_android.h index 5de9fff4..c9091349 100644 --- a/boot_control_android.h +++ b/boot_control_android.h @@ -51,7 +51,6 @@ class BootControlAndroid : public BootControlInterface { bool MarkSlotUnbootable(BootControlInterface::Slot slot) override; bool SetActiveBootSlot(BootControlInterface::Slot slot) override; bool MarkBootSuccessfulAsync(base::Callback<void(bool)> callback) override; - void Cleanup() override; DynamicPartitionControlInterface* GetDynamicPartitionControl() override; private: diff --git a/boot_control_chromeos.cc b/boot_control_chromeos.cc index 6f50176c..e972d411 100644 --- a/boot_control_chromeos.cc +++ b/boot_control_chromeos.cc @@ -329,8 +329,6 @@ int BootControlChromeOS::GetPartitionNumber( return -1; } -void BootControlChromeOS::Cleanup() {} - DynamicPartitionControlInterface* BootControlChromeOS::GetDynamicPartitionControl() { return dynamic_partition_control_.get(); diff --git a/boot_control_chromeos.h b/boot_control_chromeos.h index 7fe45702..10454be1 100644 --- a/boot_control_chromeos.h +++ b/boot_control_chromeos.h @@ -52,7 +52,6 @@ class BootControlChromeOS : public BootControlInterface { bool MarkSlotUnbootable(BootControlInterface::Slot slot) override; bool SetActiveBootSlot(BootControlInterface::Slot slot) override; bool MarkBootSuccessfulAsync(base::Callback<void(bool)> callback) override; - void Cleanup() override; DynamicPartitionControlInterface* GetDynamicPartitionControl() override; private: diff --git a/common/boot_control_interface.h b/common/boot_control_interface.h index 1242393a..41fe4eaf 100644 --- a/common/boot_control_interface.h +++ b/common/boot_control_interface.h @@ -85,9 +85,6 @@ class BootControlInterface { // of the operation. virtual bool MarkBootSuccessfulAsync(base::Callback<void(bool)> callback) = 0; - // Do necessary clean-up operations after the whole update. - virtual void Cleanup() = 0; - // Return the dynamic partition control interface. virtual DynamicPartitionControlInterface* GetDynamicPartitionControl() = 0; diff --git a/common/boot_control_stub.cc b/common/boot_control_stub.cc index 3d2b6d0a..d198e9d4 100644 --- a/common/boot_control_stub.cc +++ b/common/boot_control_stub.cc @@ -63,10 +63,6 @@ bool BootControlStub::MarkBootSuccessfulAsync( return false; } -void BootControlStub::Cleanup() { - LOG(ERROR) << __FUNCTION__ << " should never be called."; -} - DynamicPartitionControlInterface* BootControlStub::GetDynamicPartitionControl() { return dynamic_partition_control_.get(); diff --git a/common/boot_control_stub.h b/common/boot_control_stub.h index 24e5f056..1dfd08bc 100644 --- a/common/boot_control_stub.h +++ b/common/boot_control_stub.h @@ -47,7 +47,6 @@ class BootControlStub : public BootControlInterface { bool MarkSlotUnbootable(BootControlInterface::Slot slot) override; bool SetActiveBootSlot(BootControlInterface::Slot slot) override; bool MarkBootSuccessfulAsync(base::Callback<void(bool)> callback) override; - void Cleanup() override; DynamicPartitionControlInterface* GetDynamicPartitionControl() override; private: diff --git a/common/fake_boot_control.h b/common/fake_boot_control.h index d621aaee..e031fc6f 100644 --- a/common/fake_boot_control.h +++ b/common/fake_boot_control.h @@ -78,8 +78,6 @@ class FakeBootControl : public BootControlInterface { return true; } - void Cleanup() override {} - // Setters void SetNumSlots(unsigned int num_slots) { num_slots_ = num_slots; diff --git a/update_attempter_android.cc b/update_attempter_android.cc index 5bffc426..b76e05b5 100644 --- a/update_attempter_android.cc +++ b/update_attempter_android.cc @@ -597,7 +597,7 @@ void UpdateAttempterAndroid::TerminateUpdateAndNotify(ErrorCode error_code) { return; } - boot_control_->Cleanup(); + boot_control_->GetDynamicPartitionControl()->Cleanup(); download_progress_ = 0; UpdateStatus new_status = |