From 7ea0baa5b7ddea38d43d2d96f8c71a1d5df9ab8a Mon Sep 17 00:00:00 2001 From: Mekala Natarajan Date: Tue, 25 Mar 2014 12:26:57 -0700 Subject: Camera: Fix race condition in snapshot. Change-Id: I917994f3bb4663eb33ffa2c76754947f70f3cd5e Bug: 13620972 --- camera/QCameraHWI_Still.cpp | 2 ++ 1 file changed, 2 insertions(+) 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) { -- cgit v1.2.3