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

Commit e83875dd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "AudioService: add STREAM_DTMF to stream affected by ringer mode"

parents 08eccdc3 6470c91d

media/java/android/media/AudioService.java

+3 −2
Original line number Diff line number Diff line
@@ -2578,10 +2578,11 @@ public class AudioService extends IAudioService.Stub { 
                 (1 << AudioSystem.STREAM_SYSTEM)|(1 << AudioSystem.STREAM_SYSTEM_ENFORCED)),

                 UserHandle.USER_CURRENT);



        // ringtone, notification and system streams are always affected by ringer mode

        // ringtone, notification, system and dtmf streams are always affected by ringer mode

        ringerModeAffectedStreams |= (1 << AudioSystem.STREAM_RING)|

                                        (1 << AudioSystem.STREAM_NOTIFICATION)|

                                        (1 << AudioSystem.STREAM_SYSTEM);

                                        (1 << AudioSystem.STREAM_SYSTEM)|

                                        (1 << AudioSystem.STREAM_DTMF);



        if (mVoiceCapable) {

            ringerModeAffectedStreams &= ~(1 << AudioSystem.STREAM_MUSIC);