Skip to content

Commit eaf71ed

Browse files
Treehugger RobotGerrit Code Review
authored andcommitted
Merge "Add some error logs for FdTrigger errors" into main
2 parents e5164ef + d08d9de commit eaf71ed

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

libs/binder/FdTrigger.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ status_t FdTrigger::triggerablePoll(const android::RpcTransportFd& transportFd,
8282

8383
int ret = TEMP_FAILURE_RETRY(poll(pfd, countof(pfd), -1));
8484
if (ret < 0) {
85-
return -errno;
85+
int saved_errno = errno;
86+
ALOGE("FdTrigger poll returned error: %d, with error: %s", ret, strerror(saved_errno));
87+
return -saved_errno;
8688
}
8789
LOG_ALWAYS_FATAL_IF(ret == 0, "poll(%d) returns 0 with infinite timeout", transportFd.fd.get());
8890

@@ -106,6 +108,7 @@ status_t FdTrigger::triggerablePoll(const android::RpcTransportFd& transportFd,
106108

107109
// POLLNVAL: invalid FD number, e.g. not opened.
108110
if (pfd[0].revents & POLLNVAL) {
111+
ALOGE("Invalid FD number (%d) in FdTrigger (POLLNVAL)", pfd[0].fd);
109112
return BAD_VALUE;
110113
}
111114

0 commit comments

Comments
 (0)