Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b641d7e authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am d850ef7b: am a3a0bb4b: am 76ac3238: Merge "AudioService: Send the right... 

am d850ef7b: am a3a0bb4b: am 76ac3238: Merge "AudioService: Send the right stream to the volume UI on tablet changes." into mnc-dev

* commit 'd850ef7b':
  AudioService: Send the right stream to the volume UI on tablet changes.
parents c6c90296 d850ef7b

services/core/java/com/android/server/audio/AudioService.java

+1 −5
Original line number Diff line number Diff line
@@ -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];

        }



        if (streamType == AudioSystem.STREAM_MUSIC) {

            flags = updateFlagsForSystemAudio(flags);