Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-31 16:31:12 +00:00
committed by Android (Google) Code Review
parent 6ae3e60fe2 d8817a74de
commit 0f24561320
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -2194,19 +2194,19 @@ public class AudioService extends IAudioService.Stub
AudioSystem.STREAM_ASSISTANT : AudioSystem.STREAM_MUSIC; AudioSystem.STREAM_ASSISTANT : AudioSystem.STREAM_MUSIC;
if (mIsSingleVolume) { if (mIsSingleVolume) {
mStreamVolumeAlias = STREAM_VOLUME_ALIAS_TELEVISION; mStreamVolumeAlias = STREAM_VOLUME_ALIAS_TELEVISION.clone();
dtmfStreamAlias = AudioSystem.STREAM_MUSIC; dtmfStreamAlias = AudioSystem.STREAM_MUSIC;
} else if (mUseVolumeGroupAliases) { } else if (mUseVolumeGroupAliases) {
mStreamVolumeAlias = STREAM_VOLUME_ALIAS_NONE; mStreamVolumeAlias = STREAM_VOLUME_ALIAS_NONE.clone();
dtmfStreamAlias = AudioSystem.STREAM_DTMF; dtmfStreamAlias = AudioSystem.STREAM_DTMF;
} else { } else {
switch (mPlatformType) { switch (mPlatformType) {
case AudioSystem.PLATFORM_VOICE: case AudioSystem.PLATFORM_VOICE:
mStreamVolumeAlias = STREAM_VOLUME_ALIAS_VOICE; mStreamVolumeAlias = STREAM_VOLUME_ALIAS_VOICE.clone();
dtmfStreamAlias = AudioSystem.STREAM_RING; dtmfStreamAlias = AudioSystem.STREAM_RING;
break; break;
default: default:
mStreamVolumeAlias = STREAM_VOLUME_ALIAS_DEFAULT; mStreamVolumeAlias = STREAM_VOLUME_ALIAS_DEFAULT.clone();
dtmfStreamAlias = AudioSystem.STREAM_MUSIC; dtmfStreamAlias = AudioSystem.STREAM_MUSIC;
} }
if (!mNotifAliasRing) { if (!mNotifAliasRing) {