commit b1fac3ed5194a172c6e3c02bd27bcee9d1599cda
author Eric Laurent <elaurent@google.com> Thu Feb 02 16:33:54 2023 +0100
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Feb 03 00:38:36 2023 +0000
tree 9c6afe5958ee35261a002ff2f5e5842961b2fe11
parent b4625e0d0356d7cea2057eb10ca96c40b5d8c358

AudioService: fix volumegroup mute sync

When aligning the mute state of streams and volume groups, make sure
the volume group is not unmuted if the stream is muted.

Bug: 266211560
Test: repro steps in bug
Change-Id: I073b89a84d160e47511ee77ff486681ffa41ea3f
(cherry picked from commit 1aee6449772808f02767fe8dfb04b6a2cf5c3ba1)
Merged-In: I073b89a84d160e47511ee77ff486681ffa41ea3f

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

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index d888c81..d81b7d6 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -5329,7 +5329,8 @@
             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++) {
@@ -6060,6 +6061,8 @@
             }
         }
 
+        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);
@@ -6071,8 +6074,6 @@
         mSoundDoseHelper.restoreMusicActiveMs();
         mSoundDoseHelper.enforceSafeMediaVolumeIfActive(TAG);
 
-        readVolumeGroupsSettings(userSwitch);
-
         if (DEBUG_VOL) {
             Log.d(TAG, "Restoring device volume behavior");
         }
@@ -8480,7 +8481,8 @@
                     // Only propage mute of stream when applicable
                     if (mIndexMin == 0 || isCallStream(mStreamType)) {
                         // 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);
                     }
                 }
             }