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