diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-29 01:30:00 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-29 01:30:00 +0000 |
| commit | 062f32581a3e02ebae161865e8cae0b0402317a2 (patch) | |
| tree | d0771fbbb456fca95239ccb96ffa00aaea6eaf58 | |
| parent | 4c5a373e69f558e7da581cc6ae36b5a53dba8ccc (diff) | |
| parent | 2a8f89270f04d3a7b3f77f86e178d7c2edf48d89 (diff) | |
Snap for 8779833 from 2a8f89270f04d3a7b3f77f86e178d7c2edf48d89 to tm-qpr1-release
Change-Id: I143dc7dd9c06c2e6d22fba50fdba62e92fede1e6
| -rw-r--r-- | aosp/dynamic_partition_control_android.cc | 9 |
1 files changed, 8 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) { |