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

Commit 5e301465 authored by Andrei Homescu's avatar Andrei Homescu
Browse files

libbinder: clear RpcTransportCtx for new sessions in RpcServer 

RpcServer previously created new RpcSession instances
using the default transport. There is currently no code
in RpcSession that uses that transport for server sessions,
so this patch initializes the transport to nullptr instead.

Bug: 224644083
Test: atest binderRpcTest
Change-Id: Ie9fa8c9c758821614fb161b360a9935955e7e62b
parent 86124ca8

libs/binder/RpcServer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ void RpcServer::establishConnection(sp<RpcServer>&& server, base::unique_fd clie 
                }

            } while (server->mSessions.end() != server->mSessions.find(sessionId));



            session = RpcSession::make();

            session = sp<RpcSession>::make(nullptr);

            session->setMaxIncomingThreads(server->mMaxThreads);

            if (!session->setProtocolVersion(protocolVersion)) return;

libs/binder/RpcSession.cpp

+1 −0
Original line number Diff line number Diff line
@@ -715,6 +715,7 @@ bool RpcSession::setForServer(const wp<RpcServer>& server, const wp<EventListene 
    LOG_ALWAYS_FATAL_IF(mEventListener != nullptr);

    LOG_ALWAYS_FATAL_IF(eventListener == nullptr);

    LOG_ALWAYS_FATAL_IF(mShutdownTrigger != nullptr);

    LOG_ALWAYS_FATAL_IF(mCtx != nullptr);



    mShutdownTrigger = FdTrigger::make();

    if (mShutdownTrigger == nullptr) return false;