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

Commit 8391ceb3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ieb6c20d5,Iebd78154 into main 

* changes:
  RPC Binder: document RpcServerTrusty design path
  RPC Binder: cleaner cast to RpcServer.
parents c1ac6c8a c950e89f

libs/binder/RpcServer.cpp

+1 −5
Original line number Diff line number Diff line
@@ -535,11 +535,7 @@ void RpcServer::establishConnection( 
                }

            }



            if (!session->setForServer(server,

                                       sp<RpcServer::EventListener>::fromExisting(

                                               static_cast<RpcServer::EventListener*>(

                                                       server.get())),

                                       sessionId, sessionSpecificRoot)) {

            if (!session->setForServer(server, server, sessionId, sessionSpecificRoot)) {

                ALOGE("Failed to attach server to session");

                return;

            }

libs/binder/include/binder/RpcServer.h

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
namespace android {



class FdTrigger;

class RpcServerTrusty;

class RpcServerTrusty; // TODO(b/387305736) remove. Move functionality into RpcServer.

class RpcSocketAddress;



/**
@@ -247,8 +247,9 @@ public: 
    LIBBINDER_EXPORTED ~RpcServer();



private:

    friend RpcServerTrusty;

    friend RpcServerTrusty; // TODO(b/387305736): remove. Move functionality into RpcServer.

    friend sp<RpcServer>;

    friend wp<EventListener>;

    explicit RpcServer(std::unique_ptr<RpcTransportCtx> ctx);



    void onSessionAllIncomingThreadsEnded(const sp<RpcSession>& session) override;