commit ffd99cb795c92caee7f4bd0b26af9ae37b100fc3
author Eino-Ville Talvala <etalvala@google.com> Wed Aug 01 16:13:50 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Wed Aug 01 16:13:50 2012 -0700
tree 8052661f7b84736d863a553b4c3e0037729363e9
parent ffb829430ff20ccd6c13e6ed894f2373b2d93939
parent a21795c5d1d4ca9a6361e4b2db3e1f053e67b1c9

Merge "Shutter sound is heard at the end of the recorded video"

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index bf07f8b..385be50 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -721,9 +721,9 @@
     Mutex::Autolock lock(mLock);
     if (checkPidAndHardware() != NO_ERROR) return;
 
-    mCameraService->playSound(SOUND_RECORDING);
     disableMsgType(CAMERA_MSG_VIDEO_FRAME);
     mHardware->stopRecording();
+    mCameraService->playSound(SOUND_RECORDING);
 
     mPreviewBuffer.clear();
 }