diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-31 22:18:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-31 22:18:35 +0000 |
| commit | ffbdb8ad86e6a858f3f8cd812bfe2e3ec5fd4b75 (patch) | |
| tree | e10e110ed4823815e52aa46cb6f6f5aab6e2197f /services | |
| parent | 5cca30a4ee28a5e70531508d9ad607107adfaa86 (diff) | |
| parent | 841ed0a0418162bab3ae63329a77e900fa840477 (diff) | |
| download | frameworks_base-ffbdb8ad86e6a858f3f8cd812bfe2e3ec5fd4b75.zip frameworks_base-ffbdb8ad86e6a858f3f8cd812bfe2e3ec5fd4b75.tar.gz frameworks_base-ffbdb8ad86e6a858f3f8cd812bfe2e3ec5fd4b75.tar.bz2 | |
Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 6 |
1 files changed, 5 insertions, 1 deletions
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 @@ public class AudioService extends IAudioService.Stub { } 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) && |