Reset libsnapshot states before applying a new update am: c54c99646f
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2263803
Change-Id: I50c581269eddab963a4a46cf47d853483f513885
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 9b90030..1243a7f 100644
--- a/aosp/update_attempter_android.cc
+++ b/aosp/update_attempter_android.cc
@@ -266,16 +266,8 @@
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
- // applied.
- if (!DeltaPerformer::ResetUpdateProgress(
- prefs_,
- false /* quick */,
- true /* skip_dynamic_partititon_metadata_updated */)) {
- LOG(WARNING) << "Unable to reset the update progress.";
- }
+ boot_control_->GetDynamicPartitionControl()->ResetUpdate(prefs_);
+
if (!prefs_->SetString(kPrefsUpdateCheckResponseHash, payload_id)) {
LOG(WARNING) << "Unable to save the update check response hash.";
}