commit d506deef54c216feab9c6889ae21b57181128661
author Yifan Hong <elsk@google.com> Fri Sep 25 15:08:19 2020 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 30 00:12:47 2020 +0000
tree 66bb61d366634d5f7b668739648e3bf3d55c08f3
parent 420bed506f4baa36eb9b3953df068460e98bc31f

CleanupPreviousUpdateAction: refactor and add StopActionInternal

Add a new function, StopActionInternal, that stops the action.

Also refactor and let all public *Action APIs call one of Start or
Stop.

Test: pass
Bug: 169436297

Change-Id: I04877426f87f12755f9e3ba17434a4514941df99

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()