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

Commit 06ce1094 authored by Jesse Hall's avatar Jesse Hall Committed by Android Git Automerger
Browse files

am fee99040: Revert "Add more logging for dup(fd) failure"

* commit 'fee99040':
  Revert "Add more logging for dup(fd) failure"
parents 88361aaa fee99040
Loading
Loading
Loading
Loading
+3 −15
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@

#include <private/binder/binder_module.h>

#include <fcntl.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
@@ -1281,22 +1280,11 @@ status_t Parcel::read(FlattenableHelperInterface& val) const

    status_t err = NO_ERROR;
    for (size_t i=0 ; i<fd_count && err==NO_ERROR ; i++) {
        int oldfd = this->readFileDescriptor();
        fds[i] = dup(oldfd);
        fds[i] = dup(this->readFileDescriptor());
        if (fds[i] < 0) {
            int dupErrno = errno;
            err = BAD_VALUE;
            int flags = fcntl(oldfd, F_GETFD);
            int fcntlErrno = errno;
            const flat_binder_object* flat = readObject(true);
            ALOGE("dup failed in Parcel::read, fd %zu of %zu\n"
                "  dup(%d) = %d [errno: %d (%s)]\n"
                "  fcntl(%d, F_GETFD) = %d [errno: %d (%s)]\n"
                "  flat %p type %d",
                i, fd_count,
                oldfd, fds[i], dupErrno, strerror(dupErrno),
                oldfd, flags, fcntlErrno, strerror(fcntlErrno),
                flat, flat ? flat->type : 0);
            ALOGE("dup() failed in Parcel::read, i is %zu, fds[i] is %d, fd_count is %zu, error: %s",
                i, fds[i], fd_count, strerror(errno));
        }
    }