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

am: 6ca0488c4a Change-Id: If68e37558967a323705ba9b229ed64ca553ae21f
2019-11-18 15:43:13 -08:00
parent 49c03e1bab 6ca0488c4a
commit f6c107d1ea
1 changed files with 4 additions and 0 deletions
--- a/update_verifier/update_verifier.cpp
+++ b/update_verifier/update_verifier.cpp
@@ -371,6 +371,10 @@ int update_verifier(int argc, char** argv) {
        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.";
    }