diff options
| author | Eric Laurent <elaurent@google.com> | 2009-12-01 17:04:24 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-01 17:04:24 -0800 |
| commit | 811f2943a7dc475267444b9abf7d27599030a9f9 (patch) | |
| tree | 694324381b92a0819144e0e1bdcaa0988a6b6082 /camera | |
| parent | 271715e469c53112025d34fbb4b5bd3e803ef0ef (diff) | |
| parent | def563c45163fea9b53fc4627672fd43d4894b2f (diff) | |
| download | frameworks_native-811f2943a7dc475267444b9abf7d27599030a9f9.zip frameworks_native-811f2943a7dc475267444b9abf7d27599030a9f9.tar.gz frameworks_native-811f2943a7dc475267444b9abf7d27599030a9f9.tar.bz2 | |
am bb3bb57a: Merge change I524dc046 into eclair
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-mr2
* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index df59dcf..6419a5c 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -669,8 +669,14 @@ status_t CameraService::Client::startRecording() LOGD("startRecording (pid %d)", getCallingPid()); if (mMediaPlayerBeep.get() != NULL) { - mMediaPlayerBeep->seekTo(0); - mMediaPlayerBeep->start(); + // do not play record jingle if stream volume is 0 + // (typically because ringer mode is silent). + int index; + AudioSystem::getStreamVolumeIndex(AudioSystem::ENFORCED_AUDIBLE, &index); + if (index != 0) { + mMediaPlayerBeep->seekTo(0); + mMediaPlayerBeep->start(); + } } mHardware->enableMsgType(CAMERA_MSG_VIDEO_FRAME); @@ -888,8 +894,14 @@ void CameraService::Client::handleShutter( { // Play shutter sound. if (mMediaPlayerClick.get() != NULL) { - mMediaPlayerClick->seekTo(0); - mMediaPlayerClick->start(); + // do not play shutter sound if stream volume is 0 + // (typically because ringer mode is silent). + int index; + AudioSystem::getStreamVolumeIndex(AudioSystem::ENFORCED_AUDIBLE, &index); + if (index != 0) { + mMediaPlayerClick->seekTo(0); + mMediaPlayerClick->start(); + } } // Screen goes black after the buffer is unregistered. |