summaryrefslogtreecommitdiffstats
path: root/services/core
diff options
context:
space:
mode:
authorLuK1337 <priv.luk@gmail.com>2017-02-02 11:26:12 +0100
committerrazorloves <razorloves@gmail.com>2017-02-11 23:15:42 -0600
commitf1c31a5d4d4f13e3249cac825f8e22c8904aaadb (patch)
treeb075f24722fd379e734be2fdf8549003afd718f1 /services/core
parent4ba10939b7c05e4cf44d053ee8fa37a703c19e9b (diff)
downloadframeworks_base-f1c31a5d4d4f13e3249cac825f8e22c8904aaadb.zip
frameworks_base-f1c31a5d4d4f13e3249cac825f8e22c8904aaadb.tar.gz
frameworks_base-f1c31a5d4d4f13e3249cac825f8e22c8904aaadb.tar.bz2
Use STREAM_RING on non-voice capable devices
* That's what Google does. Change-Id: Iac88d161eb1dccbbb5c538d5e04d8d1fc43edef2
Diffstat (limited to 'services/core')
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java11
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) {