| commit | 7532f6ba6a484651a65a9f11c2b30c2613df98c5 | [log] [tgz] |
|---|---|---|
| author | Devin Moore <devinmoore@google.com> | Thu May 30 23:54:16 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 30 23:54:16 2024 +0000 |
| tree | 7fbe1d03215f7195108b030703fef300060350ee | |
| parent | e6c8a8cdaa1cf6b8a15ad0537f404a76565789a6 [diff] | |
| parent | 05ecf01bc7a9ffa7d1420e190e970738f13cfac4 [diff] |
Merge "RpcSession change CVD to CID" into main am: e2740b7f33 am: 05ecf01bc7 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3107023 Change-Id: Ia2daf524168587fc66c9f2d8d381a365027df8a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/include/binder/RpcSession.h b/libs/binder/include/binder/RpcSession.h index e8d9829..40102bb 100644 --- a/libs/binder/include/binder/RpcSession.h +++ b/libs/binder/include/binder/RpcSession.h
@@ -129,9 +129,9 @@ 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.