diff options
| author | 2021-09-29 14:54:48 +0000 | |
|---|---|---|
| committer | 2021-09-29 14:54:48 +0000 | |
| commit | b37acedb7fcc4c89b191548ad0e605e33d2cc4dc (patch) | |
| tree | 385f4a96a367df74fda106e9716c5ef65765dbb0 /libs/binder/RpcServer.cpp | |
| parent | a7e51752c22427dc918281ea739f391aab35bf9f (diff) | |
| parent | 43921d5d92d6e27bf1ec00de062746f032268717 (diff) | |
Merge changes from topic "libbinder-rpc-perf-poll"
* changes:
libbinder: RPC handle builtup refcounts
libbinder: RPC avoid poll
libbinder: RPC simpl transactAddressInternal
Diffstat (limited to 'libs/binder/RpcServer.cpp')
| -rw-r--r-- | libs/binder/RpcServer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp index 4c61a5902f..ba2920e3ac 100644 --- a/libs/binder/RpcServer.cpp +++ b/libs/binder/RpcServer.cpp @@ -278,7 +278,7 @@ void RpcServer::establishConnection(sp<RpcServer>&& server, base::unique_fd clie RpcConnectionHeader header; if (status == OK) { status = client->interruptableReadFully(server->mShutdownTrigger.get(), &header, - sizeof(header)); + sizeof(header), {}); if (status != OK) { ALOGE("Failed to read ID for client connecting to RPC server: %s", statusToString(status).c_str()); @@ -291,7 +291,7 @@ void RpcServer::establishConnection(sp<RpcServer>&& server, base::unique_fd clie if (header.sessionIdSize > 0) { sessionId.resize(header.sessionIdSize); status = client->interruptableReadFully(server->mShutdownTrigger.get(), - sessionId.data(), sessionId.size()); + sessionId.data(), sessionId.size(), {}); if (status != OK) { ALOGE("Failed to read session ID for client connecting to RPC server: %s", statusToString(status).c_str()); @@ -316,7 +316,7 @@ void RpcServer::establishConnection(sp<RpcServer>&& server, base::unique_fd clie }; status = client->interruptableWriteFully(server->mShutdownTrigger.get(), &response, - sizeof(response)); + sizeof(response), {}); if (status != OK) { ALOGE("Failed to send new session response: %s", statusToString(status).c_str()); // still need to cleanup before we can return |