commit e6a823c276302b0c499d7a39956c1b731f23dd4c
author Chih-Chung Chang <chihchung@google.com> Wed Oct 19 20:09:13 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 19 20:09:13 2011 -0700
tree cd1fcaaa147eeebe567a3907a45dc829fb89e957
parent d24bac2f9e83d3dbc0ef9d2aae3b8ad8e4d2b731
parent 8888a75f01d904541e409e858d23e4150ace34b6

am f806871f: Fix 5487571: Make sure shutter sound is played when it\'s enforced

* commit 'f806871f3016a8184de4c9dcfbe0b9069dc0d72c':
  Fix 5487571: Make sure shutter sound is played when it's enforced

services/camera/libcameraservice/CameraService.cpp

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 @@
     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();
     }
 }