diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2011-10-20 10:47:26 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2011-10-20 10:48:21 +0800 |
| commit | f806871f3016a8184de4c9dcfbe0b9069dc0d72c (patch) | |
| tree | 101cdbebf89847c8d2a670f1bfd8cf44222e2ad9 | |
| parent | d47d4f7b7713a4a05da7ea55c3e698b939fe81b1 (diff) | |
| download | frameworks_base-f806871f3016a8184de4c9dcfbe0b9069dc0d72c.zip frameworks_base-f806871f3016a8184de4c9dcfbe0b9069dc0d72c.tar.gz frameworks_base-f806871f3016a8184de4c9dcfbe0b9069dc0d72c.tar.bz2 | |
Fix 5487571: Make sure shutter sound is played when it's enforced
Change-Id: I0c7adf452217b8308243836b40b1fba8f2029240
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 171710a..bb0e664 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -331,14 +331,8 @@ void CameraService::playSound(sound_kind kind) { Mutex::Autolock lock(mSoundLock); sp<MediaPlayer> player = mSoundPlayer[kind]; if (player != 0) { - // do not play the sound if stream volume is 0 - // (typically because ringer mode is silent). - int index; - AudioSystem::getStreamVolumeIndex(mAudioStreamType, &index); - if (index != 0) { - player->seekTo(0); - player->start(); - } + player->seekTo(0); + player->start(); } } |