commit 8d2c6d2337e053a85c46c15d70519b78ef899686
author Xin Li <delphij@google.com> Mon Jun 27 23:25:48 2022 +0000
committer Xin Li <delphij@google.com> Mon Jun 27 23:25:48 2022 +0000
tree 0b0d4277a9f2e0dbeaf942fd645e6bada83f2988
parent 5f6e5d70d96b31c08fbca70f129b29eed3126aea
parent 4213b45e963c3d2342c3fd907bfec38d5b55041f

DO NOT MERGE - Empty merge of tm-dev-plus-aosp-without-vendor@8763363

Merged-In: Ia17d91cc878d106e9b2adeddafe35a71105e1663
Change-Id: I3e8c41b80f32d3a4ac5312f3c23809f4479d8e7a

aosp/dynamic_partition_control_android.cc

diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc
index b295442..cb38506 100644
--- a/aosp/dynamic_partition_control_android.cc
+++ b/aosp/dynamic_partition_control_android.cc
@@ -100,7 +100,8 @@
 constexpr std::chrono::milliseconds kMapSnapshotTimeout{10000};
 
 DynamicPartitionControlAndroid::~DynamicPartitionControlAndroid() {
-  Cleanup();
+  UnmapAllPartitions();
+  metadata_device_.reset();
 }
 
 static FeatureFlag GetFeatureFlag(const char* enable_prop,
@@ -316,6 +317,12 @@
 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) {