diff options
author | Elliott Hughes <enh@google.com> | 2015-05-15 19:19:28 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2015-05-15 21:17:14 -0700 |
commit | d5603e6afcc97ecba41ca0c23a105e4952b70bd0 (patch) | |
tree | 526914d9bc4dd5dec2353eb0a3c36e0642847511 | |
parent | 4a86da43b6b52ac228fc6cfce79c4ea47890eebe (diff) | |
download | android_device_generic_goldfish-d5603e6afcc97ecba41ca0c23a105e4952b70bd0.tar.gz android_device_generic_goldfish-d5603e6afcc97ecba41ca0c23a105e4952b70bd0.tar.bz2 android_device_generic_goldfish-d5603e6afcc97ecba41ca0c23a105e4952b70bd0.zip |
Don't use TEMP_FAILURE_RETRY with close in goldfish camera.
Bug: http://b/20501816
Change-Id: I622908cc02651d3c282edbc9c75ee6dd52b9c4c0
(cherry picked from commit fd22ea70a265c322e91eeb4703b10d1e9bd8f190)
-rw-r--r-- | camera/EmulatedCameraHotplugThread.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/camera/EmulatedCameraHotplugThread.cpp b/camera/EmulatedCameraHotplugThread.cpp index 0ce2aeb..bc629c1 100644 --- a/camera/EmulatedCameraHotplugThread.cpp +++ b/camera/EmulatedCameraHotplugThread.cpp @@ -87,7 +87,7 @@ void EmulatedCameraHotplugThread::requestExit() { if (rmWatchFailed) { // unlikely // Give the thread a fighting chance to error out on the next // read - if (TEMP_FAILURE_RETRY(close(mInotifyFd)) == -1) { + if (close(mInotifyFd) == -1) { ALOGE("%s: close failure error: '%s' (%d)", __FUNCTION__, strerror(errno), errno); } @@ -132,7 +132,7 @@ status_t EmulatedCameraHotplugThread::readyToRun() { status_t err = -errno; if (mInotifyFd != -1) { - TEMP_FAILURE_RETRY(close(mInotifyFd)); + close(mInotifyFd); } return err; @@ -212,7 +212,7 @@ bool EmulatedCameraHotplugThread::threadLoop() { } if (!mRunning) { - TEMP_FAILURE_RETRY(close(mInotifyFd)); + close(mInotifyFd); return false; } @@ -243,7 +243,7 @@ bool EmulatedCameraHotplugThread::createFileIfNotExists(int cameraId) const return false; } - TEMP_FAILURE_RETRY(close(fd)); + close(fd); return true; } @@ -364,7 +364,7 @@ int EmulatedCameraHotplugThread::readFile(String8 filePath) const { retval = 1; } - TEMP_FAILURE_RETRY(close(fd)); + close(fd); return retval; } |