diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-22 11:29:00 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-22 11:29:00 +0000 |
| commit | 1f80083e23233f8741042e328593a9b0690cd28e (patch) | |
| tree | 2dd5636ff95f228ed4459b59f182f96366ccd339 | |
| parent | 164659d03c31c91ad127c467dc25e3a63830a8ac (diff) | |
| parent | 1dead8334e2199cceb1779260248b554cbb94453 (diff) | |
Snap for 9430503 from 1dead8334e2199cceb1779260248b554cbb94453 to t-keystone-qcom-release
Change-Id: I5eb5ebc52bd850e0102acae59d63f706674acf5b
| -rw-r--r-- | aosp/dynamic_partition_control_android.cc | 9 | ||||
| -rw-r--r-- | aosp/update_attempter_android.cc | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc index 27d1d541..334ccdc2 100644 --- a/aosp/dynamic_partition_control_android.cc +++ b/aosp/dynamic_partition_control_android.cc @@ -98,7 +98,8 @@ constexpr std::chrono::milliseconds kMapTimeout{1000}; constexpr std::chrono::milliseconds kMapSnapshotTimeout{10000}; DynamicPartitionControlAndroid::~DynamicPartitionControlAndroid() { - Cleanup(); + UnmapAllPartitions(); + metadata_device_.reset(); } static FeatureFlag GetFeatureFlag(const char* enable_prop, @@ -312,6 +313,12 @@ bool DynamicPartitionControlAndroid::UnmapAllPartitions() { void DynamicPartitionControlAndroid::Cleanup() { UnmapAllPartitions(); metadata_device_.reset(); + if (GetVirtualAbFeatureFlag().IsEnabled()) { + snapshot_ = SnapshotManager::New(); + } else { + snapshot_ = SnapshotManagerStub::New(); + } + CHECK(snapshot_ != nullptr) << "Cannot initialize SnapshotManager."; } bool DynamicPartitionControlAndroid::DeviceExists(const std::string& path) { diff --git a/aosp/update_attempter_android.cc b/aosp/update_attempter_android.cc index a3485eac..1d35b5e7 100644 --- a/aosp/update_attempter_android.cc +++ b/aosp/update_attempter_android.cc @@ -263,6 +263,7 @@ bool UpdateAttempterAndroid::ApplyPayload( 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 |