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

Commit b0dfade9 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)"

parents 2ecebd6f 0a47f4f7

include/binder/Parcel.h

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ public: 
    

    status_t            setData(const uint8_t* buffer, size_t len);



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

    status_t            appendFrom(const Parcel *parcel,

                                   size_t start, size_t len);



    bool                hasFileDescriptors() const;

libs/binder/Parcel.cpp

+3 −3
Original line number Diff line number Diff line
@@ -353,12 +353,12 @@ status_t Parcel::setData(const uint8_t* buffer, size_t len) 
    return err;

}



status_t Parcel::appendFrom(Parcel *parcel, size_t offset, size_t len)

status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len)

{

    const sp<ProcessState> proc(ProcessState::self());

    status_t err;

    uint8_t *data = parcel->mData;

    size_t *objects = parcel->mObjects;

    const uint8_t *data = parcel->mData;

    const size_t *objects = parcel->mObjects;

    size_t size = parcel->mObjectsSize;

    int startPos = mDataPos;

    int firstIndex = -1, lastIndex = -2;