commit c64ba1ee743893065d2c30799b06216e9565c3b7
author Kelvin Zhang <zhangkelvin@google.com> Mon Jul 25 11:04:00 2022 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Mon Aug 01 18:56:23 2022 +0000
tree 2dd5636ff95f228ed4459b59f182f96366ccd339
parent 2a8f89270f04d3a7b3f77f86e178d7c2edf48d89

Cleanup DAP state before installing new OTA

Test: th
Bug: 229708688
Change-Id: Icf7ca0fac104feeddc759c580b5bcb45ffd727d6
(cherry picked from commit 42c2d55eb6df1810ca1030a520ca4d32340ecb7b)
Merged-In: Icf7ca0fac104feeddc759c580b5bcb45ffd727d6

aosp/update_attempter_android.cc

diff --git a/aosp/update_attempter_android.cc b/aosp/update_attempter_android.cc
index a3485ea..1d35b5e 100644
--- a/aosp/update_attempter_android.cc
+++ b/aosp/update_attempter_android.cc
@@ -263,6 +263,7 @@
   install_plan_.is_resume = !payload_id.empty() &&
                             DeltaPerformer::CanResumeUpdate(prefs_, payload_id);
   if (!install_plan_.is_resume) {
+    boot_control_->GetDynamicPartitionControl()->Cleanup();
     // No need to reset dynamic_partititon_metadata_updated. If previous calls
     // to AllocateSpaceForPayload uses the same payload_id, reuse preallocated
     // space. Otherwise, DeltaPerformer re-allocates space when the payload is