diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-08-01 17:22:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-01 17:22:34 -0700 |
| commit | a9ab66c5fac826a765186146128158672bfac67c (patch) | |
| tree | 9c0e95c208aba7e95023f407e6bcfe6084d14312 | |
| parent | b3192c5abf7321cb3437a3aedacd632311634bff (diff) | |
| parent | ffd99cb795c92caee7f4bd0b26af9ae37b100fc3 (diff) | |
| download | frameworks_av-a9ab66c5fac826a765186146128158672bfac67c.zip frameworks_av-a9ab66c5fac826a765186146128158672bfac67c.tar.gz frameworks_av-a9ab66c5fac826a765186146128158672bfac67c.tar.bz2 | |
am ffd99cb7: Merge "Shutter sound is heard at the end of the recorded video"
* commit 'ffd99cb795c92caee7f4bd0b26af9ae37b100fc3':
Shutter sound is heard at the end of the recorded video
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ void CameraService::Client::stopRecording() { 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(); } |