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

am: f6c107d1ea Change-Id: Idf0656eb88c1a5db992d3a6ebfe719075071aaf8
2019-11-18 15:55:12 -08:00
parent b72291bd20 f6c107d1ea
commit 7d00475162
1 changed files with 4 additions and 0 deletions
@@ -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.";
    }