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

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

Merge "libbinder: driver unfinished write error code" am: c7e949b7 am:... 

Merge "libbinder: driver unfinished write error code" am: c7e949b7 am: 3177db4b am: 9239ac80 am: fc6c7eff

Change-Id: I599d90572f7bfe64bcaeb1c99476545b4529c93f
parents 7087406a fc6c7eff

libs/binder/IPCThreadState.cpp

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

    if (err >= NO_ERROR) {

        if (bwr.write_consumed > 0) {

        if (bwr.write_consumed > 0) {

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

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

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

                LOG_ALWAYS_FATAL("Driver did not consume write buffer. "

                                 "err: %s consumed: %zu of %zu",

                                 statusToString(err).c_str(),

                                 (size_t)bwr.write_consumed,

                                 mOut.dataSize());

            else {

            else {

                mOut.setDataSize(0);

                mOut.setDataSize(0);

                processPostWriteDerefs();

                processPostWriteDerefs();