commit 6de2eb3523a4f82da80823c83b7b0b1adc9c3e7e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 11 03:27:49 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 11 03:27:49 2021 +0000
tree 19f8760064d8e0713d9dea5e78d6e462a834fcfe
parent f3c49f3802ede8e83c128c357cc7530b1fae8a5e
parent 1291f27a242b61dc26f2a448a69180f50498c772

Merge "binder: don't specify POLLHUP in .events for poll()" am: 1291f27a24

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1792852

Change-Id: Ib6b4f2b96bc141bc61394722d8b864d6446f01c2

libs/binder/FdTrigger.cpp

diff --git a/libs/binder/FdTrigger.cpp b/libs/binder/FdTrigger.cpp
index e38ac63..ecf13dc 100644
--- a/libs/binder/FdTrigger.cpp
+++ b/libs/binder/FdTrigger.cpp
@@ -44,7 +44,7 @@
 status_t FdTrigger::triggerablePoll(base::borrowed_fd fd, int16_t event) {
     while (true) {
         pollfd pfd[]{{.fd = fd.get(), .events = static_cast<int16_t>(event), .revents = 0},
-                     {.fd = mRead.get(), .events = POLLHUP, .revents = 0}};
+                     {.fd = mRead.get(), .events = 0, .revents = 0}};
         int ret = TEMP_FAILURE_RETRY(poll(pfd, arraysize(pfd), -1));
         if (ret < 0) {
             return -errno;