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

Commit fee99040 authored by Jesse Hall's avatar Jesse Hall
Browse files

Revert "Add more logging for dup(fd) failure" 

Underlying bug has been fixed, extra debug code no longer needed

This reverts commit 36273c99.

Change-Id: Ia47f1ae9ee7338329bfb8d710aff57e15e944f20
parent 8e5cf83a

libs/binder/Parcel.cpp

+3 −15
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ 




#include <private/binder/binder_module.h>

#include <private/binder/binder_module.h>





#include <fcntl.h>

#include <inttypes.h>

#include <inttypes.h>

#include <stdio.h>

#include <stdio.h>

#include <stdlib.h>

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




    status_t err = NO_ERROR;

    status_t err = NO_ERROR;

    for (size_t i=0 ; i<fd_count && err==NO_ERROR ; i++) {

    for (size_t i=0 ; i<fd_count && err==NO_ERROR ; i++) {

        int oldfd = this->readFileDescriptor();

        fds[i] = dup(this->readFileDescriptor());

        fds[i] = dup(oldfd);

        if (fds[i] < 0) {

        if (fds[i] < 0) {

            int dupErrno = errno;

            err = BAD_VALUE;

            err = BAD_VALUE;

            int flags = fcntl(oldfd, F_GETFD);

            ALOGE("dup() failed in Parcel::read, i is %zu, fds[i] is %d, fd_count is %zu, error: %s",

            int fcntlErrno = errno;

                i, fds[i], fd_count, strerror(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);

        }

        }

    }

    }