Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fefc0942 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "binder: don't specify POLLHUP in .events for poll()" am: 1291f27a am: 6de2eb35 am: 3aebb8c2 am: dc3ef2e5

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

Change-Id: I1e94658a7191cedc6889c3d69d8a60a1edfb3627
parents 05d30d22 dc3ef2e5

libs/binder/FdTrigger.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ bool FdTrigger::isTriggered() { 
status_t FdTrigger::triggerablePoll(base::borrowed_fd fd, int16_t event) {

status_t FdTrigger::triggerablePoll(base::borrowed_fd fd, int16_t event) {

    while (true) {

    while (true) {

        pollfd pfd[]{{.fd = fd.get(), .events = static_cast<int16_t>(event), .revents = 0},

        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));

        int ret = TEMP_FAILURE_RETRY(poll(pfd, arraysize(pfd), -1));

        if (ret < 0) {

        if (ret < 0) {

            return -errno;

            return -errno;