libbinder:interruptableRecv>interruptableReadFully
Rename, as suggested by elsk@, since that's what this function does.
Bug: N/A
Test: N/A
Change-Id: Ic52adef004e985df2fd16ee30224ab2f179352ee
diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp
index 540c346..6ad3b45 100644
--- a/libs/binder/RpcServer.cpp
+++ b/libs/binder/RpcServer.cpp
@@ -236,7 +236,8 @@
LOG_ALWAYS_FATAL_IF(server->mShutdownTrigger == nullptr);
int32_t id;
- bool idValid = server->mShutdownTrigger->interruptableRecv(clientFd.get(), &id, sizeof(id));
+ bool idValid =
+ server->mShutdownTrigger->interruptableReadFully(clientFd.get(), &id, sizeof(id));
if (!idValid) {
ALOGE("Failed to read ID for client connecting to RPC server.");
}
diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp
index 0ea7619..6a539d1 100644
--- a/libs/binder/RpcSession.cpp
+++ b/libs/binder/RpcSession.cpp
@@ -144,7 +144,7 @@
}
}
-bool RpcSession::FdTrigger::interruptableRecv(base::borrowed_fd fd, void* data, size_t size) {
+bool RpcSession::FdTrigger::interruptableReadFully(base::borrowed_fd fd, void* data, size_t size) {
uint8_t* buffer = reinterpret_cast<uint8_t*>(data);
uint8_t* end = buffer + size;
diff --git a/libs/binder/include/binder/RpcSession.h b/libs/binder/include/binder/RpcSession.h
index 3d22002..b8eb11f 100644
--- a/libs/binder/include/binder/RpcSession.h
+++ b/libs/binder/include/binder/RpcSession.h
@@ -141,7 +141,7 @@
* true - read succeeded at 'size'
* false - interrupted (failure or trigger)
*/
- bool interruptableRecv(base::borrowed_fd fd, void* data, size_t size);
+ bool interruptableReadFully(base::borrowed_fd fd, void* data, size_t size);
private:
base::unique_fd mWrite;