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

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

Merge "RPC Binder: Shut down the session on disconnect" am: af3a7d09 

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



Change-Id: I7f157b157acbe51b361270d58bb64506e3f54eb3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29233809 af3a7d09

libs/binder/trusty/RpcServerTrusty.cpp

+12 −2
Original line number Diff line number Diff line
@@ -154,8 +154,18 @@ int RpcServerTrusty::handleMessage(const tipc_port* /*port*/, handle_t /*chan*/, 
    return NO_ERROR;

}



void RpcServerTrusty::handleDisconnect(const tipc_port* /*port*/, handle_t /*chan*/,

                                       void* /*ctx*/) {}

void RpcServerTrusty::handleDisconnect(const tipc_port* /*port*/, handle_t /*chan*/, void* ctx) {

    auto* channelContext = reinterpret_cast<ChannelContext*>(ctx);

    if (channelContext == nullptr) {

        // Connections marked "incoming" (outgoing from the server's side)

        // do not have a valid channel context because joinFn does not get

        // called for them. We ignore them here.

        return;

    }



    auto& session = channelContext->session;

    (void)session->shutdownAndWait(false);

}



void RpcServerTrusty::handleChannelCleanup(void* ctx) {

    auto* channelContext = reinterpret_cast<ChannelContext*>(ctx);