commit 399565a0797432001ee01524e3ec8e1b856ccccd
author Emilian Peev <epeev@google.com> Mon Apr 24 19:45:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 24 19:45:15 2017 +0000
tree df70d2709e16070b9f3bcdd1f16d5807474d4cf8
parent c82bb72071772bbcecd35c6c3bf2dc7b788ad412
parent 27a6626537607daa9eff5ee81149602e34101aff

Merge "Camera: Clear available callback buffers during recording stop" into oc-dev am: 7d25f0f525
am: 27a6626537

Change-Id: I2dfcca35c589da7a08533a52b2518c7559958a53

services/camera/libcameraservice/api1/CameraClient.cpp

diff --git a/services/camera/libcameraservice/api1/CameraClient.cpp b/services/camera/libcameraservice/api1/CameraClient.cpp
index df8726e..f12cc7b 100644
--- a/services/camera/libcameraservice/api1/CameraClient.cpp
+++ b/services/camera/libcameraservice/api1/CameraClient.cpp
@@ -478,14 +478,23 @@
 // stop recording mode
 void CameraClient::stopRecording() {
     LOG1("stopRecording (pid %d)", getCallingPid());
-    Mutex::Autolock lock(mLock);
-    if (checkPidAndHardware() != NO_ERROR) return;
+    {
+        Mutex::Autolock lock(mLock);
+        if (checkPidAndHardware() != NO_ERROR) return;
 
-    disableMsgType(CAMERA_MSG_VIDEO_FRAME);
-    mHardware->stopRecording();
-    sCameraService->playSound(CameraService::SOUND_RECORDING_STOP);
+        disableMsgType(CAMERA_MSG_VIDEO_FRAME);
+        mHardware->stopRecording();
+        sCameraService->playSound(CameraService::SOUND_RECORDING_STOP);
 
-    mPreviewBuffer.clear();
+        mPreviewBuffer.clear();
+    }
+
+    {
+        Mutex::Autolock l(mAvailableCallbackBuffersLock);
+        if (!mAvailableCallbackBuffers.empty()) {
+            mAvailableCallbackBuffers.clear();
+        }
+    }
 }
 
 // release a recording frame