| commit | 6f609d1a4442478dfcbccae9be02cf191055a59c | [log] [tgz] |
|---|---|---|
| author | Daniel Zheng <zhengdaniel@google.com> | Sat Sep 24 03:07:36 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 24 03:07:36 2022 +0000 |
| tree | 83f0a7a6197776a71abb3a1932f2c6ac38588e59 | |
| parent | 3a9f96aefdabc07c0c31093db6e4315412f564b7 [diff] | |
| parent | 1d3b40ca6f39cd6eba817a96419fc8ec7a2a68dd [diff] |
Mark inactive slot as invalid after OTA completion am: 9e6bfc1a01 am: 1d3b40ca6f Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2221688 Change-Id: I808b5a8f5bb3db0421c531c9c929ded1a5a28edf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/aosp/cleanup_previous_update_action.cc b/aosp/cleanup_previous_update_action.cc index 2aba9bf..fb7bac1 100644 --- a/aosp/cleanup_previous_update_action.cc +++ b/aosp/cleanup_previous_update_action.cc
@@ -328,6 +328,7 @@ case UpdateState::MergeCompleted: { LOG(INFO) << "Merge finished with state MergeCompleted."; + boot_control_->MarkSlotUnbootable(1 - boot_control_->GetCurrentSlot()); processor_->ActionComplete(this, ErrorCode::kSuccess); return; }