commit 6ca0488c4abe808a1dcbefb55208be50443fe9c6
author Tianjie Xu <xunchang@google.com> Mon Nov 18 15:39:42 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 18 15:39:42 2019 -0800
tree 99deb3f12236fe0d31efd60215f2fa0f117fa4d4
parent bc4b39efffd37ab0b4238f3234909eb369bc478b
parent ca18e7fe5a7ad0faa4cd0fce872f44acd5c2a034

Merge "Clear the warm_reset flag after boot is successful"
am: ca18e7fe5a

Change-Id: I6253c40ca4649f62ac8383acdbbdc712dde98609

update_verifier/update_verifier.cpp

diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
index d04c455..a042f90 100644
--- a/update_verifier/update_verifier.cpp
+++ b/update_verifier/update_verifier.cpp
@@ -371,6 +371,10 @@
         return reboot_device();
       }
       LOG(INFO) << "Marked slot " << current_slot << " as booted successfully.";
+      // Clears the warm reset flag for next reboot.
+      if (!android::base::SetProperty("ota.warm_reset", "0")) {
+        LOG(WARNING) << "Failed to reset the warm reset flag";
+      }
     } else {
       LOG(INFO) << "Deferred marking slot " << current_slot << " as booted successfully.";
     }