commit 8c6a93ddb7b6d68c248e9783e22c3da1ab85b6c7
author Yifan Hong <elsk@google.com> Mon Aug 05 18:32:45 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 05 18:32:45 2019 -0700
tree 3a47ecf808a66c7e57a6029498b52649096ce2ef
parent 315b6bad4f231e981b1d21156e40b3ce7986c291
parent fbecb990da7ec5aa7fff85a4b107091e2ae9e102

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

Change-Id: I296c5e4103c5bedbcd128ee31b6670379c96f4c5

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 "