commit ed80c802955cc68b573f4ff38b5163a7790a5fe4
author Alex Deymo <deymo@google.com> Thu Sep 24 02:18:27 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 24 02:18:27 2015 +0000
tree ffa7c4c8e39b0204e8a922c8294d0475133ba425
parent be64092acf736d5fdd31fcf95a54e69776e13fb0
parent 9870c0e0a35669674198f596be71056ba0c78d62

Merge "ResetStatus() reverts the boot flags changes."

update_attempter.cc

diff --git a/update_attempter.cc b/update_attempter.cc
index 81f423d..cda244d 100644
--- a/update_attempter.cc
+++ b/update_attempter.cc
@@ -1145,6 +1145,11 @@
           ret_value = false;
       }
 
+      // Update the boot flags so the current slot has higher priority.
+      BootControlInterface* boot_control = system_state_->boot_control();
+      if (!boot_control->SetActiveBootSlot(boot_control->GetCurrentSlot()))
+        ret_value = false;
+
       // Notify the PayloadState that the successful payload was canceled.
       system_state_->payload_state()->ResetUpdateStatus();