commit cc2401a0d9d171b34e40dee5dd47546aef50ab45
author Yifan Hong <elsk@google.com> Wed Sep 30 02:17:15 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 30 02:17:15 2020 +0000
tree 25ff24b985646573febacd8e35c35fae6f0430a0
parent ba30de8572a5ed73512110b9c20a118657354fa1
parent 33bd2cff75cae5b88ae3c03a98f1d0005c095cd0

CleanupPreviousUpdateAction: refactor and add StopActionInternal am: d506deef54 am: bbbb012280 am: 1e29b681f0 am: 5faa1a2f0b am: 33bd2cff75

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1439792

Change-Id: I54abba074db36a84c97536c93884002e0ee370d0

cleanup_previous_update_action.cc

diff --git a/cleanup_previous_update_action.cc b/cleanup_previous_update_action.cc
index 1a2476f..3a7a750 100644
--- a/cleanup_previous_update_action.cc
+++ b/cleanup_previous_update_action.cc
@@ -68,29 +68,23 @@
       merge_stats_(nullptr) {}
 
 void CleanupPreviousUpdateAction::PerformAction() {
-  ResumeAction();
+  StartActionInternal();
 }
 
 void CleanupPreviousUpdateAction::TerminateProcessing() {
-  SuspendAction();
+  StopActionInternal();
 }
 
 void CleanupPreviousUpdateAction::ResumeAction() {
-  CHECK(prefs_);
-  CHECK(boot_control_);
-
-  LOG(INFO) << "Starting/resuming CleanupPreviousUpdateAction";
-  running_ = true;
   StartActionInternal();
 }
 
 void CleanupPreviousUpdateAction::SuspendAction() {
-  LOG(INFO) << "Stopping/suspending CleanupPreviousUpdateAction";
-  running_ = false;
+  StopActionInternal();
 }
 
 void CleanupPreviousUpdateAction::ActionCompleted(ErrorCode error_code) {
-  running_ = false;
+  StopActionInternal();
   ReportMergeStats();
   metadata_device_ = nullptr;
 }
@@ -103,7 +97,17 @@
   return "CleanupPreviousUpdateAction";
 }
 
+void CleanupPreviousUpdateAction::StopActionInternal() {
+  LOG(INFO) << "Stopping/suspending/completing CleanupPreviousUpdateAction";
+  running_ = false;
+}
+
 void CleanupPreviousUpdateAction::StartActionInternal() {
+  CHECK(prefs_);
+  CHECK(boot_control_);
+
+  LOG(INFO) << "Starting/resuming CleanupPreviousUpdateAction";
+  running_ = true;
   // Do nothing on non-VAB device.
   if (!boot_control_->GetDynamicPartitionControl()
            ->GetVirtualAbFeatureFlag()

cleanup_previous_update_action.h

diff --git a/cleanup_previous_update_action.h b/cleanup_previous_update_action.h
index 6f6ce07..1d8d3d7 100644
--- a/cleanup_previous_update_action.h
+++ b/cleanup_previous_update_action.h
@@ -75,6 +75,7 @@
   unsigned int last_percentage_{0};
   android::snapshot::ISnapshotMergeStats* merge_stats_;
 
+  void StopActionInternal();
   void StartActionInternal();
   void ScheduleWaitBootCompleted();
   void WaitBootCompletedOrSchedule();