summaryrefslogtreecommitdiffstats
path: root/applypatch
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-16 06:11:43 +0100
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-16 06:11:43 +0100
commite681626afa733746ba432557609de6aed67e95d9 (patch)
treeb153507f5a489ef30943f01cd8056fa5b5bb6ffa /applypatch
parentMerge "Consolidate the wait in recovery's reboot" am: a69c69b26f am: 737a2e41bd (diff)
parentMerge "Address the warnings in recovery code" am: 4577dff5a0 (diff)
downloadandroid_bootable_recovery-e681626afa733746ba432557609de6aed67e95d9.tar
android_bootable_recovery-e681626afa733746ba432557609de6aed67e95d9.tar.gz
android_bootable_recovery-e681626afa733746ba432557609de6aed67e95d9.tar.bz2
android_bootable_recovery-e681626afa733746ba432557609de6aed67e95d9.tar.lz
android_bootable_recovery-e681626afa733746ba432557609de6aed67e95d9.tar.xz
android_bootable_recovery-e681626afa733746ba432557609de6aed67e95d9.tar.zst
android_bootable_recovery-e681626afa733746ba432557609de6aed67e95d9.zip
Diffstat (limited to 'applypatch')
-rw-r--r--applypatch/imgdiff.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp
index 6ad4a6105..91007ac3b 100644
--- a/applypatch/imgdiff.cpp
+++ b/applypatch/imgdiff.cpp
@@ -965,7 +965,7 @@ bool ZipModeImage::SplitZipModeImageWithLimit(const ZipModeImage& tgt_image,
used_src_ranges.Insert(src_ranges);
split_src_ranges->push_back(std::move(src_ranges));
}
- src_ranges.Clear();
+ src_ranges = {};
// We don't have enough space for the current chunk; start a new split image and handle
// this chunk there.
@@ -1035,7 +1035,7 @@ bool ZipModeImage::AddSplitImageFromChunkList(const ZipModeImage& tgt_image,
}
ZipModeImage split_tgt_image(false);
- split_tgt_image.Initialize(std::move(aligned_tgt_chunks), {});
+ split_tgt_image.Initialize(aligned_tgt_chunks, {});
split_tgt_image.MergeAdjacentNormalChunks();
// Construct the dummy source file based on the src_ranges.
@@ -1051,7 +1051,7 @@ bool ZipModeImage::AddSplitImageFromChunkList(const ZipModeImage& tgt_image,
CHECK(!src_content.empty());
ZipModeImage split_src_image(true);
- split_src_image.Initialize(split_src_chunks, std::move(src_content));
+ split_src_image.Initialize(split_src_chunks, src_content);
split_tgt_images->push_back(std::move(split_tgt_image));
split_src_images->push_back(std::move(split_src_image));