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

Commit cd22c3ec authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Volume: allow dialog to play sound over keyguard."

parents aef5fcdc 6bd096c8

media/java/android/media/AudioService.java

+2 −3
Original line number Diff line number Diff line
@@ -850,11 +850,10 @@ public class AudioService extends IAudioService.Stub { 
            streamType = getActiveStreamType(suggestedStreamType);

        }



        // Play sounds on STREAM_RING only and if lock screen is not on.

        // Play sounds on STREAM_RING and STREAM_REMOTE_MUSIC only.

        if ((streamType != STREAM_REMOTE_MUSIC) &&

                (flags & AudioManager.FLAG_PLAY_SOUND) != 0 &&

                ((mStreamVolumeAlias[streamType] != AudioSystem.STREAM_RING)

                 || (mKeyguardManager != null && mKeyguardManager.isKeyguardLocked()))) {

                (mStreamVolumeAlias[streamType] != AudioSystem.STREAM_RING)) {

            flags &= ~AudioManager.FLAG_PLAY_SOUND;

        }