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

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

Change-Id: Ie292b03fe7420625631e3081c2f4194679af0425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Laurent
2023-03-07 19:19:29 +00:00
committed by Automerger Merge Worker

View File

@@ -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);
}
}
}