| commit | 6720583400a0f6af25d9fae05a66a87cf9e030f0 | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Thu Dec 10 20:21:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 20:21:20 2020 +0000 |
| tree | a61ee42bde85a387de7a6c8620b608b88893d25c | |
| parent | f1a4c18cce58eb8825c43bbb03a7ec1e25ee09a2 [diff] | |
| parent | 80cab7e336b2db15a54fe9b55aab1264f17ce605 [diff] |
Skip SOURCE_COPY with same src/dst extent am: 47c7d7f50c am: 80cab7e336 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1521718 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id4e8eb6816011cb589944799910aa880ea46d19c
diff --git a/payload_consumer/vabc_partition_writer.cc b/payload_consumer/vabc_partition_writer.cc index 5cb7989..2479132 100644 --- a/payload_consumer/vabc_partition_writer.cc +++ b/payload_consumer/vabc_partition_writer.cc
@@ -102,6 +102,9 @@ 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: TEST_AND_RETURN_FALSE(