summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Arseneau <earseneau@google.com>2021-06-08 09:57:32 -0700
committerEric Arseneau <earseneau@google.com>2021-06-08 09:57:32 -0700
commit84bbd32a6b9ad2f2dcd3ff64f25dfa391fca2d41 (patch)
tree5d46e8e12730025676739bd2248d3578a24a9d86
parent27eab9eb95dfd37d13f58cade99042beb4f728e5 (diff)
parentb19bc51aed2da23110292d1a3d1f14b834e1f232 (diff)
Merge mpr-2021-06-05
Change-Id: If8568f0b162fd9375947b4bb6221f22ae6b7c50f
-rw-r--r--cleanup_previous_update_action.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/cleanup_previous_update_action.cc b/cleanup_previous_update_action.cc
index 88dbc57e..9f84c3bd 100644
--- a/cleanup_previous_update_action.cc
+++ b/cleanup_previous_update_action.cc
@@ -153,6 +153,7 @@ void CleanupPreviousUpdateAction::CheckSlotMarkedSuccessfulOrSchedule() {
if (!kIsRecovery &&
!boot_control_->IsSlotMarkedSuccessful(boot_control_->GetCurrentSlot())) {
ScheduleWaitMarkBootSuccessful();
+ return;
}
if (metadata_device_ == nullptr) {