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

Merge "AudioService: fix CTS verifier for stream mute" into tm-qpr-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2023-01-11 15:11:24 +00:00
committed by Android (Google) Code Review
parent c36131f6f3 99e86bf9bd
commit de0b2d6a63
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3603,9 +3603,11 @@ public class AudioService extends IAudioService.Stub
setRingerMode(getNewRingerMode(stream, index, flags), setRingerMode(getNewRingerMode(stream, index, flags),
TAG + ".onSetStreamVolume", false /*external*/); TAG + ".onSetStreamVolume", false /*external*/);
} }
// setting non-zero volume for a muted stream unmutes the stream and vice versa, // setting non-zero volume for a muted stream unmutes the stream and vice versa
// (only when changing volume for the current device),
// except for BT SCO stream where only explicit mute is allowed to comply to BT requirements // except for BT SCO stream where only explicit mute is allowed to comply to BT requirements
if (streamType != AudioSystem.STREAM_BLUETOOTH_SCO) { if ((streamType != AudioSystem.STREAM_BLUETOOTH_SCO)
&& (getDeviceForStream(stream) == device)) {
mStreamStates[stream].mute(index == 0); mStreamStates[stream].mute(index == 0);
} }
} }