diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-05-28 22:31:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-28 22:31:42 +0000 |
| commit | 12129ccd0766ba6647ff8e2cc13f80c485d28a1f (patch) | |
| tree | 820fde73cebfd8aafbf8a8adeb42afd04c3f9376 /services/camera | |
| parent | f928c23acb7201c19b2541d057db5a5fc638babc (diff) | |
| parent | 0ec23d3f89d804cc1d9dea8f0585dc6d57bfd5c2 (diff) | |
| download | frameworks_av-12129ccd0766ba6647ff8e2cc13f80c485d28a1f.zip frameworks_av-12129ccd0766ba6647ff8e2cc13f80c485d28a1f.tar.gz frameworks_av-12129ccd0766ba6647ff8e2cc13f80c485d28a1f.tar.bz2 | |
Merge "Camera3Device: Do not call cleanUpFailedRequest with mutex held" into mnc-dev
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Device.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index e2a53a2..0bc8ed1 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -2765,11 +2765,13 @@ bool Camera3Device::RequestThread::threadLoop() { // error ALOGE("RequestThread: Can't get input buffer, skipping request:" " %s (%d)", strerror(-res), res); - Mutex::Autolock l(mRequestLock); - if (mListener != NULL) { - mListener->notifyError( - ICameraDeviceCallbacks::ERROR_CAMERA_REQUEST, - nextRequest->mResultExtras); + { + Mutex::Autolock l(mRequestLock); + if (mListener != NULL) { + mListener->notifyError( + ICameraDeviceCallbacks::ERROR_CAMERA_REQUEST, + nextRequest->mResultExtras); + } } cleanUpFailedRequest(request, nextRequest, outputBuffers); return true; @@ -2792,11 +2794,13 @@ bool Camera3Device::RequestThread::threadLoop() { // error ALOGE("RequestThread: Can't get output buffer, skipping request:" " %s (%d)", strerror(-res), res); - Mutex::Autolock l(mRequestLock); - if (mListener != NULL) { - mListener->notifyError( - ICameraDeviceCallbacks::ERROR_CAMERA_REQUEST, - nextRequest->mResultExtras); + { + Mutex::Autolock l(mRequestLock); + if (mListener != NULL) { + mListener->notifyError( + ICameraDeviceCallbacks::ERROR_CAMERA_REQUEST, + nextRequest->mResultExtras); + } } cleanUpFailedRequest(request, nextRequest, outputBuffers); return true; |