Merge "Merge "AudioService: fix BT SCO volume mute" into tm-qpr-dev am: 77c924780c am: e5a19023eb" into udc-dev

2023-03-07 19:20:15 +00:00
parent 6a97c26e8b f7953e46fb
commit 67f5714932
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -8588,7 +8588,9 @@ public class AudioService extends IAudioService.Stub
                    if (isMutable()) {
                        // For call stream, align mute only when muted, not when index is set to 0
                        mVolumeGroupState.mute(
-                                forceMuteState ? mIsMuted : groupIndex == 0 || mIsMuted);
+                                forceMuteState ? mIsMuted :
+                                        (groupIndex == 0 && !isCallStream(mStreamType))
+                                                || mIsMuted);
                    }
                }
            }