Merge "Clear the warm_reset flag after boot is successful"

am: 3fc3d75eb0

Change-Id: I7da336fa51761f133c633a9ba9997c99772b1e9c
This commit is contained in:
Tianjie Xu 2019-12-10 10:37:48 -08:00 committed by android-build-merger
commit 9e9e9143b0

View file

@ -170,6 +170,10 @@ Status cp_commitChanges() {
if (!cr.success)
return error(EINVAL, "Error marking booted successfully: " + std::string(cr.errMsg));
LOG(INFO) << "Marked slot as booted successfully.";
// Clears the warm reset flag for next reboot.
if (!SetProperty("ota.warm_reset", "0")) {
LOG(WARNING) << "Failed to reset the warm reset flag";
}
}
// Must take action for list of mounted checkpointed things here
// To do this, we walk the list of mounted file systems.