summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/audio/AudioService.java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-06-18 15:45:07 -0400
committerJohn Spurlock <jspurlock@google.com>2015-06-18 15:45:07 -0400
commit72966d6d83413dc89d3051f30bdc0941cbfc7bb1 (patch)
tree0fe7a602031f5c14e83e64b4b3778b650f867ff0 /services/core/java/com/android/server/audio/AudioService.java
parent6bc12244480fcdeca84080d5382d63eb2b992883 (diff)
downloadframeworks_base-72966d6d83413dc89d3051f30bdc0941cbfc7bb1.zip
frameworks_base-72966d6d83413dc89d3051f30bdc0941cbfc7bb1.tar.gz
frameworks_base-72966d6d83413dc89d3051f30bdc0941cbfc7bb1.tar.bz2
AudioService: Send the right stream to the volume UI on tablet changes.
Bug: 21798314 Change-Id: Idd49eb9e1253a94e567866a38b664035aea3715b
Diffstat (limited to 'services/core/java/com/android/server/audio/AudioService.java')
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index d39b25f..47d3bde 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -1542,11 +1542,7 @@ public class AudioService extends IAudioService.Stub {
// UI update and Broadcast Intent
private void sendVolumeUpdate(int streamType, int oldIndex, int index, int flags) {
- if (!isPlatformVoice() && (streamType == AudioSystem.STREAM_RING)) {
- streamType = AudioSystem.STREAM_NOTIFICATION;
- } else {
- streamType = mStreamVolumeAlias[streamType];
- }
+ streamType = mStreamVolumeAlias[streamType];
if (streamType == AudioSystem.STREAM_MUSIC) {
flags = updateFlagsForSystemAudio(flags);