Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d91f36a9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "binder: Remove unnecessary std::move" into main am: 2f30faff 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3213371



Change-Id: I3b1d91225402ae2ad01d3eb4dcb9bada738d41e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d5d421a 2f30faff

libs/binder/tests/binderRecordReplayTest.cpp

+5 −5
Original line number Diff line number Diff line
@@ -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) {

libs/binder/tests/parcel_fuzzer/random_parcel_seeds.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>