diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-05-02 19:22:30 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-05-02 19:22:30 +0200 |
| commit | a0ce80942766948d4cd1036b97e2ee721ed8ecce (patch) | |
| tree | 5d596eea5771aa9f494d2b1fcf6b3b44da2d401c /services/core/java/com/android/server/audio/AudioService.java | |
| parent | a3f7b1e4871de0b508bbefb0236d258d47a38f15 (diff) | |
| parent | 0e4f9e2f03e376f0816c1e653bf97fe1d0176794 (diff) | |
| download | frameworks_base-a0ce80942766948d4cd1036b97e2ee721ed8ecce.zip frameworks_base-a0ce80942766948d4cd1036b97e2ee721ed8ecce.tar.gz frameworks_base-a0ce80942766948d4cd1036b97e2ee721ed8ecce.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_base into replicant-6.0HEADreplicant-6.0-0001replicant-6.0
Diffstat (limited to 'services/core/java/com/android/server/audio/AudioService.java')
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index fe3df61..7b90c83 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -1101,10 +1101,13 @@ public class AudioService extends IAudioService.Stub { mStreamVolumeAlias[AudioSystem.STREAM_DTMF] = dtmfStreamAlias; - if (mLinkNotificationWithVolume && mVoiceCapable) { - mStreamVolumeAlias[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_RING; - } else { - mStreamVolumeAlias[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_NOTIFICATION; + if (mVoiceCapable) { + if (mLinkNotificationWithVolume) { + mStreamVolumeAlias[AudioSystem.STREAM_NOTIFICATION] = AudioSystem.STREAM_RING; + } else { + mStreamVolumeAlias[AudioSystem.STREAM_NOTIFICATION] = + AudioSystem.STREAM_NOTIFICATION; + } } if (updateVolumes) { |