| commit | 642a6f4a8b01bd852ab9ee71a5392f671971d458 | [log] [tgz] |
|---|---|---|
| author | Daniel Zheng <zhengdaniel@google.com> | Tue Nov 08 22:29:19 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 08 22:29:19 2022 +0000 |
| tree | fa9236fa5864367d0f43c7d57a967c91dfc864d2 | |
| parent | 06904a509a2a69b39a4bf37693f3b9e451770cb0 [diff] | |
| parent | e76cf564f11740df32b348bb4aadd63dafe2897a [diff] |
Clear completion marker upon resetting slot switch am: e76cf564f1 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2292522 Change-Id: If4faf7d51f22aa3151bc2339739c9a5afa7a2492 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/aosp/update_attempter_android.cc b/aosp/update_attempter_android.cc index 1243a7f..0dc7f83 100644 --- a/aosp/update_attempter_android.cc +++ b/aosp/update_attempter_android.cc
@@ -1229,6 +1229,7 @@ return LogAndSetError( error, FROM_HERE, "Already processing an update, cancel it first."); } + TEST_AND_RETURN_FALSE(ClearUpdateCompletedMarker()); // Update the boot flags so the current slot has higher priority. if (!boot_control_->SetActiveBootSlot(GetCurrentSlot())) { return LogAndSetError(error, FROM_HERE, "Failed to SetActiveBootSlot");