commit f6c107d1ea9dea42bdec014a7b6f063d007e56b0
author Tianjie Xu <xunchang@google.com> Mon Nov 18 15:43:13 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 18 15:43:13 2019 -0800
tree 99deb3f12236fe0d31efd60215f2fa0f117fa4d4
parent 49c03e1babca8694e577fe163a3dfa8a78d4ee46
parent 6ca0488c4abe808a1dcbefb55208be50443fe9c6

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

Change-Id: If68e37558967a323705ba9b229ed64ca553ae21f

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.";
     }