summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-16 06:46:41 +0100
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-16 06:46:41 +0100
commit776e0e70861f5c99edd052c8cd01b70af5d4f116 (patch)
treeb153507f5a489ef30943f01cd8056fa5b5bb6ffa
parentMerge "Consolidate the wait in recovery's reboot" am: a69c69b26f am: 737a2e41bd am: 2bc65f82f6 am: 49facf582d (diff)
parentMerge "Address the warnings in recovery code" am: 4577dff5a0 am: 03abec6ecb am: e681626afa (diff)
downloadandroid_bootable_recovery-776e0e70861f5c99edd052c8cd01b70af5d4f116.tar
android_bootable_recovery-776e0e70861f5c99edd052c8cd01b70af5d4f116.tar.gz
android_bootable_recovery-776e0e70861f5c99edd052c8cd01b70af5d4f116.tar.bz2
android_bootable_recovery-776e0e70861f5c99edd052c8cd01b70af5d4f116.tar.lz
android_bootable_recovery-776e0e70861f5c99edd052c8cd01b70af5d4f116.tar.xz
android_bootable_recovery-776e0e70861f5c99edd052c8cd01b70af5d4f116.tar.zst
android_bootable_recovery-776e0e70861f5c99edd052c8cd01b70af5d4f116.zip
-rw-r--r--applypatch/imgdiff.cpp6
-rw-r--r--edify/include/edify/expr.h2
-rw-r--r--updater/include/private/commands.h2
3 files changed, 5 insertions, 5 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));
diff --git a/edify/include/edify/expr.h b/edify/include/edify/expr.h
index cd9c70120..3ddf7f5fe 100644
--- a/edify/include/edify/expr.h
+++ b/edify/include/edify/expr.h
@@ -60,7 +60,7 @@ struct Value {
BLOB = 2,
};
- Value(Type type, const std::string& str) : type(type), data(str) {}
+ Value(Type type, std::string str) : type(type), data(std::move(str)) {}
Type type;
std::string data;
diff --git a/updater/include/private/commands.h b/updater/include/private/commands.h
index 79f915434..7a23bb78b 100644
--- a/updater/include/private/commands.h
+++ b/updater/include/private/commands.h
@@ -307,7 +307,7 @@ class Command {
: type_(type),
index_(index),
cmdline_(std::move(cmdline)),
- patch_(std::move(patch)),
+ patch_(patch),
target_(std::move(target)),
source_(std::move(source)),
stash_(std::move(stash)) {}