Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4410e0d authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Iad6bc0eed894e43826102b6d0311aa7f4dfce87f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99cc93a1 ac751403

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

+6 −4
Original line number Diff line number Diff line
@@ -5205,7 +5205,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++) {
@@ -5930,6 +5931,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);








@@ -5947,8 +5950,6 @@ public class AudioService extends IAudioService.Stub







            }









        }

















        readVolumeGroupsSettings(userSwitch);

















        if (DEBUG_VOL) {









            Log.d(TAG, "Restoring device volume behavior");









        }








@@ -8394,7 +8395,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);









                    }









                }









            }