ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* commit '06ce1094706bb0856f6cc876e1f5276adc642446':
  Revert "Add more logging for dup(fd) failure"
This commit is contained in:
Jesse Hall 2014-11-04 17:40:28 +00:00 committed by Android Git Automerger
commit 6eb6b9fd8c
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/binder/Parcel.cpp
View File

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