diff options
| author | 2024-08-12 07:10:01 +0000 | |
|---|---|---|
| committer | 2024-08-12 07:10:01 +0000 | |
| commit | 2f30faffa56e04ca71c7bf53c43fc48379bfb518 (patch) | |
| tree | cc2d0060015f2169d5f692a8b8c125779c67d60d | |
| parent | f9d7f291bd915a36bae14978f8049efab4411c5a (diff) | |
| parent | 0aa16393dca78a8974a82da8e427306dc385b61c (diff) | |
Merge "binder: Remove unnecessary std::move" into main
| -rw-r--r-- | libs/binder/tests/binderRecordReplayTest.cpp | 10 | ||||
| -rw-r--r-- | libs/binder/tests/parcel_fuzzer/random_parcel_seeds.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libs/binder/tests/binderRecordReplayTest.cpp b/libs/binder/tests/binderRecordReplayTest.cpp index b975fad2c9..f867b42b1c 100644 --- a/libs/binder/tests/binderRecordReplayTest.cpp +++ b/libs/binder/tests/binderRecordReplayTest.cpp @@ -99,12 +99,12 @@ public: GENERATE_GETTER_SETTER(SingleDataParcelableArray, std::vector<SingleDataParcelable>); Status setFileDescriptor(unique_fd input) { - mFd = std::move(unique_fd(dup(input))); + mFd = unique_fd(dup(input)); return Status::ok(); } Status getFileDescriptor(unique_fd* output) { - *output = std::move(unique_fd(dup(mFd))); + *output = unique_fd(dup(mFd)); return Status::ok(); } unique_fd mFd; @@ -117,7 +117,7 @@ std::vector<uint8_t> retrieveData(borrowed_fd fd) { std::vector<uint8_t> buffer(fdStat.st_size); auto readResult = android::base::ReadFully(fd, buffer.data(), fdStat.st_size); EXPECT_TRUE(readResult != 0); - return std::move(buffer); + return buffer; } void replayFuzzService(const sp<BpBinder>& binder, const RecordedTransaction& transaction) { @@ -387,8 +387,8 @@ TEST_F(BinderRecordReplayTest, ReplayFd) { // When fds are replayed, it will be replaced by /dev/null..reading from it should yield // null data - recordReplay(&IBinderRecordReplayTest::setFileDescriptor, std::move(unique_fd(dup(saved))), - &IBinderRecordReplayTest::getFileDescriptor, std::move(unique_fd(dup(changed)))); + recordReplay(&IBinderRecordReplayTest::setFileDescriptor, unique_fd(dup(saved)), + &IBinderRecordReplayTest::getFileDescriptor, unique_fd(dup(changed))); } int main(int argc, char** argv) { diff --git a/libs/binder/tests/parcel_fuzzer/random_parcel_seeds.cpp b/libs/binder/tests/parcel_fuzzer/random_parcel_seeds.cpp index fd9777a916..0ed8a554ac 100644 --- a/libs/binder/tests/parcel_fuzzer/random_parcel_seeds.cpp +++ b/libs/binder/tests/parcel_fuzzer/random_parcel_seeds.cpp @@ -55,7 +55,7 @@ std::vector<uint8_t> reverseBytes(T min, T max, T val) { offset += CHAR_BIT; } - return std::move(reverseData); + return reverseData; } template <typename T> |