diff options
| author | Yimin Li <ymli@google.com> | 2022-10-21 20:59:42 -0700 |
|---|---|---|
| committer | Yimin Li <ymli@google.com> | 2022-10-21 20:59:42 -0700 |
| commit | ef6f14b62b22a20e7331c5b2de75dff7985d3a7d (patch) | |
| tree | 2dd5636ff95f228ed4459b59f182f96366ccd339 | |
| parent | 2fafacaedef0f4b01a357c17bb48a701d66b8eef (diff) | |
| parent | b9e99ba8c242c269ecdd9b39a5e297eadc403f06 (diff) | |
Merge commit 'b9e99ba8c242c269ecdd9b39a5e297eadc403f06' of sso://googleplex-android/platform/system/update_engine into HEAD
Change-Id: Iee0e6ed3b4d1dfa419d9b534b7976560d1d5c3da
| -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 |