summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2011-10-20 10:47:26 +0800
committerChih-Chung Chang <chihchung@google.com>2011-10-20 10:48:21 +0800
commit8888a75f01d904541e409e858d23e4150ace34b6 (patch)
tree1eb29ccaddc5a26faa3a22774418952eb35fd21b /services
parent2e5bcd4a0d1f3078acfd88785aa29923ae03a3bb (diff)
downloadframeworks_av-8888a75f01d904541e409e858d23e4150ace34b6.zip
frameworks_av-8888a75f01d904541e409e858d23e4150ace34b6.tar.gz
frameworks_av-8888a75f01d904541e409e858d23e4150ace34b6.tar.bz2
Fix 5487571: Make sure shutter sound is played when it's enforced
Change-Id: I0c7adf452217b8308243836b40b1fba8f2029240
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/CameraService.cpp10
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();
}
}