commit b2f0f79a9d0559c8433d6ffe46af09a958499931
author Kelvin Zhang <zhangkelvin@google.com> Mon Mar 08 22:41:34 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 08 22:41:34 2021 +0000
tree 46fc898b011a6257184645e5d31dc2ba7781bc1d
parent b6bcbfd28d37851b8cc25975a1456d10d3daef15
parent 3eef175fdad220388529510683ee4d8fa7980177

Only skip CowCopy ops with same src/dst block am: 4430ea57a7 am: ac01ba03f0 am: 3eef175fda

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1610433

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a3091efc924f7c581399f74d0938ce29890eba8

payload_consumer/vabc_partition_writer.cc

diff --git a/payload_consumer/vabc_partition_writer.cc b/payload_consumer/vabc_partition_writer.cc
index aa8c3ce..0843fff 100644
--- a/payload_consumer/vabc_partition_writer.cc
+++ b/payload_consumer/vabc_partition_writer.cc
@@ -102,11 +102,11 @@
   std::vector<uint8_t> buffer(block_size);
 
   for (const auto& cow_op : converted) {
-    if (cow_op.src_block == cow_op.dst_block) {
-      continue;
-    }
     switch (cow_op.op) {
       case CowOperation::CowCopy:
+        if (cow_op.src_block == cow_op.dst_block) {
+          continue;
+        }
         TEST_AND_RETURN_FALSE(
             cow_writer->AddCopy(cow_op.dst_block, cow_op.src_block));
         break;