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

Commit 0f245613 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AudioService: fix stream aliasing update" into tm-qpr-dev

parents 6ae3e60f d8817a74

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

+4 −4
Original line number Diff line number Diff line
@@ -2194,19 +2194,19 @@ public class AudioService extends IAudioService.Stub 
                AudioSystem.STREAM_ASSISTANT : AudioSystem.STREAM_MUSIC;















        if (mIsSingleVolume) {













            mStreamVolumeAlias = STREAM_VOLUME_ALIAS_TELEVISION;













            mStreamVolumeAlias = STREAM_VOLUME_ALIAS_TELEVISION.clone();















            dtmfStreamAlias = AudioSystem.STREAM_MUSIC;















        } else if (mUseVolumeGroupAliases) {













            mStreamVolumeAlias = STREAM_VOLUME_ALIAS_NONE;













            mStreamVolumeAlias = STREAM_VOLUME_ALIAS_NONE.clone();















            dtmfStreamAlias = AudioSystem.STREAM_DTMF;















        } else {















            switch (mPlatformType) {















                case AudioSystem.PLATFORM_VOICE:













                    mStreamVolumeAlias = STREAM_VOLUME_ALIAS_VOICE;













                    mStreamVolumeAlias = STREAM_VOLUME_ALIAS_VOICE.clone();















                    dtmfStreamAlias = AudioSystem.STREAM_RING;















                    break;















                default:













                    mStreamVolumeAlias = STREAM_VOLUME_ALIAS_DEFAULT;













                    mStreamVolumeAlias = STREAM_VOLUME_ALIAS_DEFAULT.clone();















                    dtmfStreamAlias = AudioSystem.STREAM_MUSIC;















            }















            if (!mNotifAliasRing) {