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

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

Merge "libbinder: RPC simplify flush commands" am: 0204dcc5 am: b910fdca... 

Merge "libbinder: RPC simplify flush commands" am: 0204dcc5 am: b910fdca am: 248e989b am: 6b3db3de

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

Change-Id: Iebfe09ce6359368c1e46510d654e98604970fedf
parents fe3431f8 6b3db3de

libs/binder/RpcState.cpp

+6 −6
Original line number Diff line number Diff line
@@ -885,12 +885,6 @@ processTransactInternalTailCall: 
        }

    }



    // Binder refs are flushed for oneway calls only after all calls which are

    // built up are executed. Otherwise, they fill up the binder buffer.

    if (addr != 0 && replyStatus == OK && !oneway) {

        replyStatus = flushExcessBinderRefs(session, addr, target);

    }



    if (oneway) {

        if (replyStatus != OK) {

            ALOGW("Oneway call failed with error: %d", replyStatus);
@@ -950,6 +944,12 @@ processTransactInternalTailCall: 
        return OK;

    }



    // Binder refs are flushed for oneway calls only after all calls which are

    // built up are executed. Otherwise, they fill up the binder buffer.

    if (addr != 0 && replyStatus == OK) {

        replyStatus = flushExcessBinderRefs(session, addr, target);

    }



    LOG_ALWAYS_FATAL_IF(std::numeric_limits<int32_t>::max() - sizeof(RpcWireHeader) -

                                        sizeof(RpcWireReply) <

                                reply.dataSize(),