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

Commit 05ecf01b authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "RpcSession change CVD to CID" into main am: e2740b7f 

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



Change-Id: I70160355e13f7b1e11e6b2261a7a2ee24343c7f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49d968a5 e2740b7f

libs/binder/include/binder/RpcSession.h

+2 −2
Original line number Diff line number Diff line
@@ -129,9 +129,9 @@ public: 
    setupUnixDomainSocketBootstrapClient(binder::unique_fd bootstrap);



    /**

     * Connects to an RPC server at the CVD & port.

     * Connects to an RPC server at the CID & port.

     */

    [[nodiscard]] LIBBINDER_EXPORTED status_t setupVsockClient(unsigned int cvd, unsigned int port);

    [[nodiscard]] LIBBINDER_EXPORTED status_t setupVsockClient(unsigned int cid, unsigned int port);



    /**

     * Connects to an RPC server at the given address and port.