| commit | 22a1f8f274843f8fadf67ecb3e1b0011761e4bef | [log] [tgz] |
|---|---|---|
| author | Daniel Zheng <zhengdaniel@google.com> | Sat Sep 24 04:02:52 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 24 04:02:52 2022 +0000 |
| tree | 83f0a7a6197776a71abb3a1932f2c6ac38588e59 | |
| parent | 9ad147bdbad33c5d9b6c354094eb1076854ae382 [diff] | |
| parent | 28a1620acc06d5c551eaae9b5506ba5e320e9157 [diff] |
Mark inactive slot as invalid after OTA completion am: 9e6bfc1a01 am: 1d3b40ca6f am: 6f609d1a44 am: 28a1620acc Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2221688 Change-Id: I1a6f73a1cabc386a5a68d6736b235cc0122a5343 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; }