diff options
| author | Daniel Trevino Perez <c_dtrevi@quicinc.com> | 2010-04-15 17:23:59 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-12-14 05:14:34 -0500 |
| commit | dc1bd26ea64eb4444be4e35062afd17d168c8959 (patch) | |
| tree | 1e7606d0a9fc09b9887f164fb8bca0737502e5e4 | |
| parent | 493119e94be3f9656e1ae5035234ad2778b1a6ce (diff) | |
| download | frameworks_base-dc1bd26ea64eb4444be4e35062afd17d168c8959.zip frameworks_base-dc1bd26ea64eb4444be4e35062afd17d168c8959.tar.gz frameworks_base-dc1bd26ea64eb4444be4e35062afd17d168c8959.tar.bz2 | |
platform/frameworks/base: Call stopRecording first then start beepSignal
- Prioritize stopRecording call to avoid recording stop beep from being
recorded onto file.
Change-Id: Ia8c15b18699406ee2d32635fc83adecd290d0be1
CRs-Fixed: 234429
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 578cac0..738821c 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -827,14 +827,15 @@ void CameraService::Client::stopRecording() return; } + mHardware->disableMsgType(CAMERA_MSG_VIDEO_FRAME); + mHardware->stopRecording(); + LOGV("stopRecording(), hardware stopped OK"); + if (mMediaPlayerBeep.get() != NULL) { mMediaPlayerBeep->seekTo(0); mMediaPlayerBeep->start(); } - mHardware->disableMsgType(CAMERA_MSG_VIDEO_FRAME); - mHardware->stopRecording(); - LOGV("stopRecording(), hardware stopped OK"); } // hold preview buffer lock |