diff options
| author | Mekala Natarajan <mekalan@codeaurora.org> | 2014-03-25 22:06:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 22:06:42 +0000 |
| commit | 6190e43e892ea5369c59ed86bf941c7ae6797c53 (patch) | |
| tree | 824090b209d31f445f393e6ac08b168dcfded70e /camera | |
| parent | e7382a13da70ebc0fe03312d61c9130176b19070 (diff) | |
| parent | 7ea0baa5b7ddea38d43d2d96f8c71a1d5df9ab8a (diff) | |
| download | mako-6190e43e892ea5369c59ed86bf941c7ae6797c53.tar.gz | |
am 7ea0baa5: Camera: Fix race condition in snapshot.
* commit '7ea0baa5b7ddea38d43d2d96f8c71a1d5df9ab8a':
Camera: Fix race condition in snapshot.
Diffstat (limited to 'camera')
| -rwxr-xr-x | camera/QCameraHWI_Still.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/QCameraHWI_Still.cpp b/camera/QCameraHWI_Still.cpp index 83bb783..34d8765 100755 --- a/camera/QCameraHWI_Still.cpp +++ b/camera/QCameraHWI_Still.cpp @@ -2082,11 +2082,13 @@ status_t QCameraStream_Snapshot::receiveRawPicture(mm_camera_ch_data_buf_t* recv goto end; } + mStopCallbackLock.unlock(); if(!mHalCamCtrl->mShutterSoundPlayed) { notifyShutter(&crop, true); } notifyShutter(&crop, false); mHalCamCtrl->mShutterSoundPlayed = false; + mStopCallbackLock.lock(); if(mHalCamCtrl->mHdrMode == HDR_MODE) { if ((hdrRawCount % 3) != 2) { |