Merge "Clear the warm_reset flag after boot is successful"

am: ca18e7fe5a

Change-Id: I6253c40ca4649f62ac8383acdbbdc712dde98609
This commit is contained in:
Tianjie Xu 2019-11-18 15:39:42 -08:00 committed by android-build-merger
commit 6ca0488c4a

View file

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