Merge "AudioService: fix BT SCO volume mute" into tm-qpr-dev am: 77c924780c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21756379 Change-Id: Idd7af15535154d8540d8fe0d479f570375fbacc6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -8402,7 +8402,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user