| commit | ac01ba03f08db19b4429d94c9a0369fc5b5bbf99 | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Mon Mar 08 21:54:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 08 21:54:26 2021 +0000 |
| tree | 2a5d4fa51f6ea3f640e242c36a8d7d6c0c96051e | |
| parent | b8e2485b171b3100cc6e38f677427fd9f09be78f [diff] | |
| parent | 4430ea57a7e53e6b3556c2e8591931131e2e8812 [diff] |
Only skip CowCopy ops with same src/dst block am: 4430ea57a7 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1610433 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If355620a293b59794ebd27817fb6aea48038f7c8
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;