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

Commit 531fcadc authored by Orlando Arbildo's avatar Orlando Arbildo
Browse files

TrustyRpc: Adding a create session with initialization callback function 

Original RpcTrustyConnect function didn't allow callbacks on the
connection. Enabling this functionality required us to do some initialization
on the session itself before connecting.
Added a RpcTrustyConnectWithSessionInitializer function that
allows the caller to pass a callback function that can be used to initialize
the session object before a connection is made.
Tested that this change can be used to modify setMaxIncomingThreads to enable
callbacks and one-way functions on it.

Bug: None
Test: None
Change-Id: I9b53b54131a2c7fd24294aae5ab102b7c0f154e2
parent 00a54e41

libs/binder/RpcTrusty.cpp

+10 −1
Original line number Diff line number Diff line
@@ -26,8 +26,12 @@ namespace android { 


using android::base::unique_fd;



sp<IBinder> RpcTrustyConnect(const char* device, const char* port) {

sp<RpcSession> RpcTrustyConnectWithSessionInitializer(

        const char* device, const char* port,

        std::function<void(sp<RpcSession>&)> sessionInitializer) {

    auto session = RpcSession::make(RpcTransportCtxFactoryTipcAndroid::make());

    // using the callback to initialize the session

    sessionInitializer(session);

    auto request = [=] {

        int tipcFd = tipc_connect(device, port);

        if (tipcFd < 0) {
@@ -40,6 +44,11 @@ sp<IBinder> RpcTrustyConnect(const char* device, const char* port) { 
        LOG(ERROR) << "Failed to set up Trusty client. Error: " << statusToString(status).c_str();

        return nullptr;

    }

    return session;

}



sp<IBinder> RpcTrustyConnect(const char* device, const char* port) {

    auto session = RpcTrustyConnectWithSessionInitializer(device, port, [](auto) {});

    return session->getRootObject();

}

libs/binder/include_trusty/binder/RpcTrusty.h

+4 −0
Original line number Diff line number Diff line
@@ -22,4 +22,8 @@ namespace android { 


sp<IBinder> RpcTrustyConnect(const char* device, const char* port);



sp<RpcSession> RpcTrustyConnectWithSessionInitializer(

        const char* device, const char* port,

        std::function<void(sp<RpcSession>&)> sessionInitializer);



} // namespace android