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

Commit 5f8d44b4 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 tm-dev am: 7855d321 

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



Change-Id: Iae63b9862ac52dc41f740df3f7fb14b2a8d4a8b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1566b7e 7855d321

libs/binder/RpcState.cpp

+6 −1
Original line number Original line Diff line number Diff line
@@ -701,7 +701,12 @@ status_t RpcState::processCommand(const sp<RpcSession::RpcConnection>& connectio 




    switch (command.command) {

    switch (command.command) {

        case RPC_COMMAND_TRANSACT:

        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);

            return processTransact(connection, session, command);

        case RPC_COMMAND_DEC_STRONG:

        case RPC_COMMAND_DEC_STRONG:

            return processDecStrong(connection, session, command);

            return processDecStrong(connection, session, command);