diff options
author | Arne Coucheron <arco68@gmail.com> | 2016-10-27 09:47:10 +0200 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2016-10-27 20:13:17 +0200 |
commit | 6b9dac8b7f047fed67a608ae777877facf20f0fe (patch) | |
tree | 014be30c00191ca1cbc19671a74f54dc884fe26b /libc/bionic/close.cpp | |
parent | 0d0b7a99e1baea5875467325829e0dafabb270b1 (diff) | |
download | android_bionic-cm-14.0.tar.gz android_bionic-cm-14.0.tar.bz2 android_bionic-cm-14.0.zip |
Revert "bionic: Registration of trapping calls during libc initialization"cm-14.0
* Breaks camera on some devices.
This reverts commit 0ca32a954f09c5eca1afd9b009389e10a88d3537.
Change-Id: Id8652cf0e35ecf1ff4bb00899e1342ce04ebc409
Diffstat (limited to 'libc/bionic/close.cpp')
-rw-r--r-- | libc/bionic/close.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/libc/bionic/close.cpp b/libc/bionic/close.cpp index 2d01965f6..18225f015 100644 --- a/libc/bionic/close.cpp +++ b/libc/bionic/close.cpp @@ -31,21 +31,8 @@ extern "C" int ___close(int); -#ifdef USE_WRAPPER -#include "codeaurora/PropClientDispatch.h" -#endif - int close(int fd) { - int rc; -#ifndef USE_WRAPPER - rc = ___close(fd); -#else - if ( __propClientDispatch.propClose ) { - rc = __propClientDispatch.propClose(fd); - } else { - rc = ___close(fd); - } -#endif + int rc = ___close(fd); if (rc == -1 && errno == EINTR) { // POSIX says that if close returns with EINTR, the fd must not be closed. // Linus disagrees: http://lkml.indiana.edu/hypermail/linux/kernel/0509.1/0877.html |