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

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

Merge "Add some error logs for FdTrigger errors" into main am: eaf71ed4 am: 70822d39 

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



Change-Id: Id4ecbc160b65274c2ab4defdfd446869e1f6b750
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c69b0852 70822d39

libs/binder/FdTrigger.cpp

+4 −1
Original line number Diff line number Diff line
@@ -82,7 +82,9 @@ status_t FdTrigger::triggerablePoll(const android::RpcTransportFd& transportFd, 


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

    if (ret < 0) {

        return -errno;

        int saved_errno = errno;

        ALOGE("FdTrigger poll returned error: %d, with error: %s", ret, strerror(saved_errno));

        return -saved_errno;

    }

    LOG_ALWAYS_FATAL_IF(ret == 0, "poll(%d) returns 0 with infinite timeout", transportFd.fd.get());
@@ -106,6 +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);

        return BAD_VALUE;

    }