diff options
| author | 2021-05-25 02:08:25 +0000 | |
|---|---|---|
| committer | 2021-05-25 02:08:25 +0000 | |
| commit | 6c6cd10c01a613f20a00a8e8394b5977c9e0ff33 (patch) | |
| tree | 5dba907c8c71ed7e73dd15fe41bc692b9adb4b49 /libs/binder/RpcState.h | |
| parent | 852b51965659446709a3ea97feb89d406a6d7f9f (diff) | |
| parent | bf6d2a9c43d0961c48d63a62e546c8a6067c4a52 (diff) | |
Merge "libbinder: shutdown session threads" am: c1500480cb am: e8990d0d2a am: bf6d2a9c43
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1716214
Change-Id: I7ba3189b956e19a909b591e88a3acbde89a6d83d
Diffstat (limited to 'libs/binder/RpcState.h')
| -rw-r--r-- | libs/binder/RpcState.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/binder/RpcState.h b/libs/binder/RpcState.h index 31f8a22065..f913925adb 100644 --- a/libs/binder/RpcState.h +++ b/libs/binder/RpcState.h @@ -117,7 +117,8 @@ private: [[nodiscard]] bool rpcSend(const base::unique_fd& fd, const char* what, const void* data, size_t size); - [[nodiscard]] bool rpcRec(const base::unique_fd& fd, const char* what, void* data, size_t size); + [[nodiscard]] bool rpcRec(const base::unique_fd& fd, const sp<RpcSession>& session, + const char* what, void* data, size_t size); [[nodiscard]] status_t waitForReply(const base::unique_fd& fd, const sp<RpcSession>& session, Parcel* reply); @@ -130,6 +131,7 @@ private: const sp<RpcSession>& session, CommandData transactionData); [[nodiscard]] status_t processDecStrong(const base::unique_fd& fd, + const sp<RpcSession>& session, const RpcWireHeader& command); struct BinderNode { |