diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-08-01 16:15:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-01 16:15:36 -0700 |
| commit | 9007619d1f786a75dae0fff31feadbf9aed9cfb8 (patch) | |
| tree | dd3f273e129ea9864e87d4df79eb78dab157744e /services | |
| parent | 44cda3a4e7ca3de0db9cb49145def3803b03ebb4 (diff) | |
| parent | 35f859b338c0922094ecfc37fb8157530df6b305 (diff) | |
| download | frameworks_av-9007619d1f786a75dae0fff31feadbf9aed9cfb8.zip frameworks_av-9007619d1f786a75dae0fff31feadbf9aed9cfb8.tar.gz frameworks_av-9007619d1f786a75dae0fff31feadbf9aed9cfb8.tar.bz2 | |
Merge "Shutter sound is heard at the end of the recorded video" into jb-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/CameraClient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp index 80ccb43..54829ef 100644 --- a/services/camera/libcameraservice/CameraClient.cpp +++ b/services/camera/libcameraservice/CameraClient.cpp @@ -445,9 +445,9 @@ void CameraClient::stopRecording() { Mutex::Autolock lock(mLock); if (checkPidAndHardware() != NO_ERROR) return; - mCameraService->playSound(CameraService::SOUND_RECORDING); disableMsgType(CAMERA_MSG_VIDEO_FRAME); mHardware->stopRecording(); + mCameraService->playSound(CameraService::SOUND_RECORDING); mPreviewBuffer.clear(); } |