commit c5827cec8e29a6031ec5092f94e2b67bda1117bc
author Jean-Michel Trivi <jmtrivi@google.com> Fri Jul 31 22:25:57 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 31 22:25:57 2015 +0000
tree 7149ec0348eb3d471eea3f01a0581194950f2f9a
parent 51a8fe950efb67e23b7bb64719322c0a7b415367
parent ffbdb8ad86e6a858f3f8cd812bfe2e3ec5fd4b75

am ffbdb8ad: Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev

* commit 'ffbdb8ad86e6a858f3f8cd812bfe2e3ec5fd4b75':
  Fix that shutter sound does not play after ringer mode changes to vibrator

services/core/java/com/android/server/audio/AudioService.java

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 1223a00..094cb57 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -1260,7 +1260,11 @@
                 }
                 for (int stream = 0; stream < mStreamStates.length; stream++) {
                     if (streamTypeAlias == mStreamVolumeAlias[stream]) {
-                        mStreamStates[stream].mute(state);
+                        if (!(readCameraSoundForced()
+                                    && (mStreamStates[stream].getStreamType()
+                                        == AudioSystem.STREAM_SYSTEM_ENFORCED))) {
+                            mStreamStates[stream].mute(state);
+                        }
                     }
                 }
             } else if ((direction == AudioManager.ADJUST_RAISE) &&