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

Commit 74e98bfd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "AudioService: fix BT SCO volume mute" into tm-qpr-dev am:... 

Merge "Merge "AudioService: fix BT SCO volume mute" into tm-qpr-dev am: 77c92478 am: e5a19023" into udc-dev am: 67f57149 am: c84f6950

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21756379



Change-Id: I1454bfb053f0b4b8088254a7581bafbbb9cc1ad3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 442d35f9 c84f6950

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -8597,7 +8597,9 @@ public class AudioService extends IAudioService.Stub 
                    if (isMutable()) {

                    if (isMutable()) {

                        // For call stream, align mute only when muted, not when index is set to 0

                        // For call stream, align mute only when muted, not when index is set to 0

                        mVolumeGroupState.mute(

                        mVolumeGroupState.mute(

                                forceMuteState ? mIsMuted : groupIndex == 0 || mIsMuted);

                                forceMuteState ? mIsMuted :

                                        (groupIndex == 0 && !isCallStream(mStreamType))

                                                || mIsMuted);

                    }

                    }

                }

                }

            }

            }