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

Commit a9a4078b authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder Parcel: compareData const." into main am: e7fecc8c 

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



Change-Id: I3ab7d5d673236030b7b31c5b7dda652fffc84878
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6eadade e7fecc8c

libs/binder/Parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ status_t Parcel::appendFrom(const Parcel* parcel, size_t offset, size_t len) { 
    return err;

}



int Parcel::compareData(const Parcel& other) {

int Parcel::compareData(const Parcel& other) const {

    size_t size = dataSize();

    if (size != other.dataSize()) {

        return size < other.dataSize() ? -1 : 1;

libs/binder/include/binder/Parcel.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ public: 


    LIBBINDER_EXPORTED status_t appendFrom(const Parcel* parcel, size_t start, size_t len);



    LIBBINDER_EXPORTED int compareData(const Parcel& other);

    LIBBINDER_EXPORTED int compareData(const Parcel& other) const;

    LIBBINDER_EXPORTED status_t compareDataInRange(size_t thisOffset, const Parcel& other,

                                                   size_t otherOffset, size_t length,

                                                   int* result) const;