commit ee6144d7ca946390c02911e5eb68536720887c3a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jan 21 16:25:08 2025 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jan 21 16:25:08 2025 -0800
tree 2033de55fd781a49c5e85b00078c6585a62d8fed
parent e754d6064ad363ea83f17877f9b95d83a4db342c
parent a21364a4fcf248d8798564c1b7b2a9202d08f4e6

Snap for 12948418 from a21364a4fcf248d8798564c1b7b2a9202d08f4e6 to 25Q2-release

Change-Id: Ie03900fe3ca30e179ce8b1762363aee9aec7a4bd

aosp/update_attempter_android.cc

diff --git a/aosp/update_attempter_android.cc b/aosp/update_attempter_android.cc
index 89c79f3..943c3e4 100644
--- a/aosp/update_attempter_android.cc
+++ b/aosp/update_attempter_android.cc
@@ -482,6 +482,18 @@
 }
 
 bool UpdateAttempterAndroid::CancelUpdate(Error* error) {
+  auto action = processor_->current_action();
+  if (action != nullptr &&
+      action->Type() == CleanupPreviousUpdateAction::StaticType()) {
+    return LogAndSetError(
+        error,
+        __LINE__,
+        __FILE__,
+        "CleanupPreviousUpdateAction is running, this action cannot be "
+        "canceled. As it often performs critical merge operations after "
+        "reboot.",
+        ErrorCode::kRollbackNotPossible);
+  }
   if (!processor_->IsRunning())
     return LogAndSetGenericError(
         error, __LINE__, __FILE__, "No ongoing update to cancel.");