Merge "Make invalid FD a fatal error in FdTrigger" into main

Treehugger Robot · Gerrit Code Review · commit 357c2ed35dce · 2024-09-13T16:31:26.000Z
diff --git a/libs/binder/FdTrigger.cpp b/libs/binder/FdTrigger.cpp
@@ -108,7 +108,7 @@ status_t FdTrigger::triggerablePoll(const android::RpcTransportFd& transportFd,
 
     // POLLNVAL: invalid FD number, e.g. not opened.
     if (pfd[0].revents & POLLNVAL) {
-        ALOGE("Invalid FD number (%d) in FdTrigger (POLLNVAL)", pfd[0].fd);
+        LOG_ALWAYS_FATAL("Invalid FD number (%d) in FdTrigger (POLLNVAL)", pfd[0].fd);
         return BAD_VALUE;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ status_t FdTrigger::triggerablePoll(const android::RpcTransportFd& transportFd,`
`108`	`108`
`109`	`109`	`// POLLNVAL: invalid FD number, e.g. not opened.`
`110`	`110`	`if (pfd[0].revents & POLLNVAL) {`
`111`		`- ALOGE("Invalid FD number (%d) in FdTrigger (POLLNVAL)", pfd[0].fd);`
	`111`	`+ LOG_ALWAYS_FATAL("Invalid FD number (%d) in FdTrigger (POLLNVAL)", pfd[0].fd);`
`112`	`112`	`return BAD_VALUE;`
`113`	`113`	`}`
`114`	`114`