commit 216bc3ac71a8813b5177f73a1ed3c5d442042155
author Yifan Hong <elsk@google.com> Wed Oct 16 21:49:36 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 16 21:49:36 2019 -0700
tree 6f7c659a00ccc106aee9060875c1103953efa1d4
parent 79e8f335466ec683c19bb0c3bbebc8d4c6410058
parent ecc45413ebf8fb7288b96a6975dc277baf427143

DynamicPartitionControl: Load metadata correctly for downgrading Virtual A/B am: 50a56c6a28
am: ecc45413eb

Change-Id: I4389339e4f89ba5026dcdf8515979dfc6d9fe006

dynamic_partition_control_android.cc

diff --git a/dynamic_partition_control_android.cc b/dynamic_partition_control_android.cc
index 90e489a..a8210cf 100644
--- a/dynamic_partition_control_android.cc
+++ b/dynamic_partition_control_android.cc
@@ -257,8 +257,12 @@
     builder =
         MetadataBuilder::New(PartitionOpener(), super_device, source_slot);
   } else {
-    builder = MetadataBuilder::NewForUpdate(
-        PartitionOpener(), super_device, source_slot, target_slot);
+    bool always_keep_source_slot = !target_supports_snapshot_;
+    builder = MetadataBuilder::NewForUpdate(PartitionOpener(),
+                                            super_device,
+                                            source_slot,
+                                            target_slot,
+                                            always_keep_source_slot);
   }
 
   if (builder == nullptr) {