commit 3b346a959a1bc140599dc135db21da286dd1da94
author Yifan Hong <elsk@google.com> Wed Jul 31 11:18:07 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 31 11:18:07 2019 -0700
tree 803eb75949da38f8b3485f101d92cff1cf8c2f15
parent b7c69a4fb334b241ff22da4213d52638eee2572b
parent f9464b4faa1ae76e2c1f8cf2e217e375e93465ad

DynamicPartitionControlAndroid::LoadMetadataBuilder: always NewForUpdate
am: f9464b4faa

Change-Id: I79c84f469d09ac6b0faa853c9047f39f016e18c2

dynamic_partition_control_android.cc

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