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

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

Merge "libbinder: RPC sockets - remove unnecessary SIGHUP" am: 3bb5fa61 am:... 

Merge "libbinder: RPC sockets - remove unnecessary SIGHUP" am: 3bb5fa61 am: 317cf4b2 am: 1888932b am: 3301b5b0

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

Change-Id: Iff6628368f7bce34c1531ab0d0f6486197c58df8
parents 1388a58d 3301b5b0

libs/binder/RpcSession.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -181,9 +181,7 @@ bool RpcSession::FdTrigger::isTriggered() { 




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

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

    while (true) {

    while (true) {

        pollfd pfd[]{{.fd = fd.get(),

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

                      .events = static_cast<int16_t>(event | POLLHUP),

                      .revents = 0},

                     {.fd = mRead.get(), .events = POLLHUP, .revents = 0}};

                     {.fd = mRead.get(), .events = POLLHUP, .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) {