diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-08-01 16:37:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 16:37:10 +0000 |
| commit | 4bdc317923d205045921c37b4d6cfe2bd406b856 (patch) | |
| tree | 39eb78d2f21f23e88859e885c2458aa67374b8c6 | |
| parent | 4cf97c915a3a1bb88fec3a99beee5675ae35acfe (diff) | |
| parent | de680550e4e77627f01ae4dff7b3fb8c6e08bd18 (diff) | |
| download | frameworks_base-4bdc317923d205045921c37b4d6cfe2bd406b856.zip frameworks_base-4bdc317923d205045921c37b4d6cfe2bd406b856.tar.gz frameworks_base-4bdc317923d205045921c37b4d6cfe2bd406b856.tar.bz2 | |
am de680550: am ffbdb8ad: Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev
* commit 'de680550e4e77627f01ae4dff7b3fb8c6e08bd18':
Fix that shutter sound does not play after ringer mode changes to vibrator
| -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) && |