diff options
| author | 2021-10-21 16:50:33 +0000 | |
|---|---|---|
| committer | 2021-10-21 16:50:33 +0000 | |
| commit | 5f852b9c9bca236b01f8d59853d29fb6b6ee89b6 (patch) | |
| tree | 1f5d043aa131c58b18ebbfa0e79e4dfb408c80a5 /libs/binder/RpcState.cpp | |
| parent | bc584178dacac2afb131e8a3b0de994c0643dc6d (diff) | |
| parent | 51c44a96895b8c462e24984e510b09aded52297f (diff) | |
Merge "libbinder: support server-specific session"
Diffstat (limited to 'libs/binder/RpcState.cpp')
| -rw-r--r-- | libs/binder/RpcState.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/binder/RpcState.cpp b/libs/binder/RpcState.cpp index 9ba64f3407..09b3d68626 100644 --- a/libs/binder/RpcState.cpp +++ b/libs/binder/RpcState.cpp @@ -870,7 +870,9 @@ processTransactInternalTailCall: if (server) { switch (transaction->code) { case RPC_SPECIAL_TRANSACT_GET_ROOT: { - replyStatus = reply.writeStrongBinder(server->getRootObject()); + sp<IBinder> root = session->mSessionSpecificRootObject + ?: server->getRootObject(); + replyStatus = reply.writeStrongBinder(root); break; } default: { |