commit fbecb990da7ec5aa7fff85a4b107091e2ae9e102
author Yifan Hong <elsk@google.com> Mon Aug 05 18:26:45 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 05 18:26:45 2019 -0700
tree 3a47ecf808a66c7e57a6029498b52649096ce2ef
parent 6dd00232f34a3390253d5de7e353fd2ba251b31a
parent d824c627e4cd58f7827361684a9eeafd7f54dcf7

fix DynamicPartitionControlAndroid::LoadMetadataBuilder am: 30fa5f523f
am: d824c627e4

Change-Id: I43b283994ce6234e91083aac94a2dd033b569fd1

dynamic_partition_control_android.cc

diff --git a/dynamic_partition_control_android.cc b/dynamic_partition_control_android.cc
index 1a1e021..d9d3be5 100644
--- a/dynamic_partition_control_android.cc
+++ b/dynamic_partition_control_android.cc
@@ -204,8 +204,14 @@
     const std::string& super_device,
     uint32_t source_slot,
     uint32_t target_slot) {
-  auto builder = MetadataBuilder::NewForUpdate(
-      PartitionOpener(), super_device, source_slot, target_slot);
+  std::unique_ptr<MetadataBuilder> builder;
+  if (target_slot == BootControlInterface::kInvalidSlot) {
+    builder =
+        MetadataBuilder::New(PartitionOpener(), super_device, source_slot);
+  } else {
+    builder = MetadataBuilder::NewForUpdate(
+        PartitionOpener(), super_device, source_slot, target_slot);
+  }
 
   if (builder == nullptr) {
     LOG(WARNING) << "No metadata slot "