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

Merge "AudioService: fix volume group mute" into rvc-dev

Browse Source
This commit is contained in:
Eric Laurent
2020-06-12 15:12:40 +00:00
committed by Android (Google) Code Review
parent 8140ae8d22 b94b9c60f1
commit ff373b4676
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5322,6 +5322,15 @@ public class AudioService extends IAudioService.Stub
} }
private void setVolumeIndexInt(int index, int device, int flags) { private void setVolumeIndexInt(int index, int device, int flags) {
// Reflect mute state of corresponding stream by forcing index to 0 if muted
// Only set audio policy BT SCO stream volume to 0 when the stream is actually muted.
// This allows RX path muting by the audio HAL only when explicitly muted but not when
// index is just set to 0 to repect BT requirements
if (mStreamStates[mPublicStreamType].isFullyMuted()) {
index = 0;
} else if (mPublicStreamType == AudioSystem.STREAM_BLUETOOTH_SCO && index == 0) {
index = 1;
}
// Set the volume index // Set the volume index
AudioSystem.setVolumeIndexForAttributes(mAudioAttributes, index, device); AudioSystem.setVolumeIndexForAttributes(mAudioAttributes, index, device);
} }