commit c220383f69e33e6a6ac63b23cdfb93cdb9666043
author Yifan Hong <elsk@google.com> Wed Jul 31 11:29:24 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 31 11:29:24 2019 -0700
tree 803eb75949da38f8b3485f101d92cff1cf8c2f15
parent 5bf8e26f0e3b7dcbbd1c1c6be74156466d53a65b
parent 3b346a959a1bc140599dc135db21da286dd1da94

DynamicPartitionControlAndroid::LoadMetadataBuilder: always NewForUpdate am: f9464b4faa
am: 3b346a959a

Change-Id: Ic42df7a713f894875d53675eda472d78b8f78cf3

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 "