summaryrefslogtreecommitdiff
path: root/libs/binder/RpcState.h
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2021-06-10 19:42:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-06-10 19:42:32 +0000
commite2347131c5f507ac8d33ffed8ef584f5612d119d (patch)
tree5ae9c7539061131561288ed094d17ec86310aa64 /libs/binder/RpcState.h
parent6c823504fcba3d3c74adcf4edd7bfda56d7face6 (diff)
parent936fc19aa0ca565dc0903c577658676ad76575b7 (diff)
Merge changes Id38049ed,I13bc9126,I9fbc7594 am: 936fc19aa0
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1729615 Change-Id: Iaf50c712f933f5a4f88c49b33177e54d046cb959
Diffstat (limited to 'libs/binder/RpcState.h')
-rw-r--r--libs/binder/RpcState.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/binder/RpcState.h b/libs/binder/RpcState.h
index 13c31154eb..5bfef69c32 100644
--- a/libs/binder/RpcState.h
+++ b/libs/binder/RpcState.h
@@ -51,6 +51,9 @@ public:
RpcState();
~RpcState();
+ status_t sendConnectionInit(const base::unique_fd& fd, const sp<RpcSession>& session);
+ status_t readConnectionInit(const base::unique_fd& fd, const sp<RpcSession>& session);
+
// TODO(b/182940634): combine some special transactions into one "getServerInfo" call?
sp<IBinder> getRootObject(const base::unique_fd& fd, const sp<RpcSession>& session);
status_t getMaxThreads(const base::unique_fd& fd, const sp<RpcSession>& session,
@@ -144,8 +147,7 @@ private:
const RpcWireHeader& command);
[[nodiscard]] status_t processTransactInternal(const base::unique_fd& fd,
const sp<RpcSession>& session,
- CommandData transactionData,
- sp<IBinder>&& targetRef);
+ CommandData transactionData);
[[nodiscard]] status_t processDecStrong(const base::unique_fd& fd,
const sp<RpcSession>& session,
const RpcWireHeader& command);