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

Merge "AudioService: fix volumegroup mute sync" into tm-qpr-dev

Browse Source
This commit is contained in:
Eric Laurent
2023-02-02 19:01:54 +00:00
committed by Android (Google) Code Review
parent 84ea730da0 1aee644977
commit ac7514038f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5202,7 +5202,8 @@ public class AudioService extends IAudioService.Stub
if (!shouldMute) {
// unmute
// ring and notifications volume should never be 0 when not silenced
if (mStreamVolumeAlias[streamType] == AudioSystem.STREAM_RING) {
if (mStreamVolumeAlias[streamType] == AudioSystem.STREAM_RING
|| mStreamVolumeAlias[streamType] == AudioSystem.STREAM_NOTIFICATION) {
synchronized (VolumeStreamState.class) {
final VolumeStreamState vss = mStreamStates[streamType];
for (int i = 0; i < vss.mIndexMap.size(); i++) {
@@ -5927,6 +5928,8 @@ public class AudioService extends IAudioService.Stub
}
}
readVolumeGroupsSettings(userSwitch);
// apply new ringer mode before checking volume for alias streams so that streams
// muted by ringer mode have the correct volume
setRingerModeInt(getRingerModeInternal(), false);
@@ -5944,8 +5947,6 @@ public class AudioService extends IAudioService.Stub
}
}
readVolumeGroupsSettings(userSwitch);
if (DEBUG_VOL) {
Log.d(TAG, "Restoring device volume behavior");
}
@@ -8387,7 +8388,8 @@ public class AudioService extends IAudioService.Stub
// Only propage mute of stream when applicable
if (isMutable()) {
// For call stream, align mute only when muted, not when index is set to 0
mVolumeGroupState.mute(forceMuteState ? mIsMuted : groupIndex == 0);
mVolumeGroupState.mute(
forceMuteState ? mIsMuted : groupIndex == 0 || mIsMuted);
}
}
}