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

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

Merge "RPC Binder: clearer errors for wrong transact type" into udc-dev am:... 

Merge "RPC Binder: clearer errors for wrong transact type" into udc-dev am: 562e3b86 am: 2112dc78

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



Change-Id: Ida9e39eb22cbf7f58d1e97ac792eb4a48a0193fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6245dc76 2112dc78

libs/binder/RpcState.cpp

+6 −1
Original line number Diff line number Diff line
@@ -796,7 +796,12 @@ status_t RpcState::processCommand( 


    switch (command.command) {

        case RPC_COMMAND_TRANSACT:

            if (type != CommandType::ANY) return BAD_TYPE;

            if (type != CommandType::ANY) {

                ALOGE("CommandType %d, but got RPC command %d.", static_cast<int>(type),

                      command.command);

                (void)session->shutdownAndWait(false);

                return BAD_TYPE;

            }

            return processTransact(connection, session, command, std::move(ancillaryFds));

        case RPC_COMMAND_DEC_STRONG:

            return processDecStrong(connection, session, command);