diff options
author | Jesse Hall <jessehall@google.com> | 2014-11-04 08:35:12 -0800 |
---|---|---|
committer | Jesse Hall <jessehall@google.com> | 2014-11-04 08:47:57 -0800 |
commit | 8e5cf83afbe2b671f96d04786cf0d0f967e342f9 (patch) | |
tree | 11af72263fab84ee8dce828718447ae67d9c01e9 /libs/binder | |
parent | de288fe2d43adfa1b2243ae534faaf832bf50491 (diff) | |
download | frameworks_native-8e5cf83afbe2b671f96d04786cf0d0f967e342f9.zip frameworks_native-8e5cf83afbe2b671f96d04786cf0d0f967e342f9.tar.gz frameworks_native-8e5cf83afbe2b671f96d04786cf0d0f967e342f9.tar.bz2 |
Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
Underlying bug has been fixed, extra debug code no longer needed.
This reverts commit ccf851f108c008d086b7f3c3923d60d385985e71.
Change-Id: I19ad9239efdf1d8f70cd74af9b7c2ae97713208f
Diffstat (limited to 'libs/binder')
-rw-r--r-- | libs/binder/Parcel.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 1dbb06f..61bdbc6 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -26,7 +26,6 @@ #include <binder/TextOutput.h> #include <errno.h> -#include <utils/CallStack.h> #include <utils/Debug.h> #include <utils/Log.h> #include <utils/String8.h> @@ -768,29 +767,6 @@ status_t Parcel::writeFileDescriptor(int fd, bool takeOwnership) status_t Parcel::writeDupFileDescriptor(int fd) { int dupFd = dup(fd); - - { // Temporary extra debug validation for b/17477219: a Parcel recipient is - // getting a positive but invalid fd unexpectedly. Trying to track down - // where it's coming from. - int dupErrno = dupFd < 0 ? errno : 0; - int fdFlags = fcntl(fd, F_GETFD); - int fdFlagsErrno = fdFlags == -1 ? errno : 0; - int dupFlags = fcntl(dupFd, F_GETFD); - int dupFlagsErrno = dupFlags == -1 ? errno : 0; - if (dupFd < 0 || fdFlags == -1 || dupFlags == -1) { - ALOGE("Parcel::writeDupFileDescriptor failed:\n" - " fd=%d flags=%d err=%d(%s)\n" - " dupFd=%d dupErr=%d(%s) flags=%d err=%d(%s)", - fd, fdFlags, fdFlagsErrno, strerror(fdFlagsErrno), - dupFd, dupErrno, strerror(dupErrno), - dupFlags, dupFlagsErrno, strerror(dupFlagsErrno)); - if (fd < 0 || fdFlags == -1) { - CallStack(LOG_TAG); - } - return -errno; - } - } - if (dupFd < 0) { return -errno; } @@ -1321,7 +1297,6 @@ status_t Parcel::read(FlattenableHelperInterface& val) const oldfd, fds[i], dupErrno, strerror(dupErrno), oldfd, flags, fcntlErrno, strerror(fcntlErrno), flat, flat ? flat->type : 0); - CallStack(LOG_TAG); } } |