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

Merge "Merge "AudioService: fix muting of aliased volume streams" into tm-qpr-dev am: 9705323f41 am: 6f86018b4c"

Browse Source
This commit is contained in:
Automerger Merge Worker
2023-02-02 21:35:26 +00:00
committed by Android (Google) Code Review
parent 769d56c7e7 8847f88226
commit a8736302d1
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3647,11 +3647,12 @@ public class AudioService extends IAudioService.Stub
synchronized (VolumeStreamState.class) {
List<Integer> streamsToMute = new ArrayList<>();
for (int stream = 0; stream < mStreamStates.length; stream++) {
if (streamAlias == mStreamVolumeAlias[stream]) {
VolumeStreamState vss = mStreamStates[stream];
if (streamAlias == mStreamVolumeAlias[stream] && vss.isMutable()) {
if (!(readCameraSoundForced()
&& (mStreamStates[stream].getStreamType()
&& (vss.getStreamType()
== AudioSystem.STREAM_SYSTEM_ENFORCED))) {
boolean changed = mStreamStates[stream].mute(state, /* apply= */ false);
boolean changed = vss.mute(state, /* apply= */ false);
if (changed) {
streamsToMute.add(stream);
}
@@ -8478,7 +8479,7 @@ public class AudioService extends IAudioService.Stub
}
mVolumeGroupState.updateVolumeIndex(groupIndex, device);
// Only propage mute of stream when applicable
if (mIndexMin == 0 || isCallStream(mStreamType)) {
if (isMutable()) {
// For call stream, align mute only when muted, not when index is set to 0
mVolumeGroupState.mute(forceMuteState ? mIsMuted : groupIndex == 0);
}
@@ -8529,6 +8530,12 @@ public class AudioService extends IAudioService.Stub
return mIsMuted || mIsMutedInternally;
}
private boolean isMutable() {
return isStreamAffectedByMute(mStreamType)
&& (mIndexMin == 0 || isCallStream(mStreamType));
}
/**
* Mute/unmute the stream
* @param state the new mute state