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

Commit caf0dd54 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "libbinder: remove Parcel::remove" 

am: 1b034009

Change-Id: Iedf8b6ca36e6d15c95890950689bf6ba2225d566
parents ca8c3ded 1b034009

libs/binder/IPCThreadState.cpp

+1 −1
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ status_t IPCThreadState::talkWithDriver(bool doReceive) 
    if (err >= NO_ERROR) {

        if (bwr.write_consumed > 0) {

            if (bwr.write_consumed < mOut.dataSize())

                mOut.remove(0, bwr.write_consumed);

                LOG_ALWAYS_FATAL("Driver did not consume write buffer");

            else {

                mOut.setDataSize(0);

                processPostWriteDerefs();

libs/binder/Parcel.cpp

+0 −5
Original line number Diff line number Diff line
@@ -1394,11 +1394,6 @@ status_t Parcel::writeNoException() 
    return status.writeToParcel(this);

}



void Parcel::remove(size_t /*start*/, size_t /*amt*/)

{

    LOG_ALWAYS_FATAL("Parcel::remove() not yet implemented!");

}



status_t Parcel::validateReadData(size_t upperBound) const

{

    // Don't allow non-object reads on object data

libs/binder/include/binder/Parcel.h

+0 −2
Original line number Diff line number Diff line
@@ -236,8 +236,6 @@ public: 
    // stack gathering and serialization that the Java implementation does.

    status_t            writeNoException();

    

    void                remove(size_t start, size_t amt);

    

    status_t            read(void* outData, size_t len) const;

    const void*         readInplace(size_t len) const;

    int32_t             readInt32() const;