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

Commit 1e4b5989 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "MediaFocusControl: Deny audio focus if notification stream is 0" into cm-11.0

parents b45bb86e 39fe476d

media/java/android/media/MediaFocusControl.java

+6 −0
Original line number Diff line number Diff line
@@ -642,6 +642,12 @@ public class MediaFocusControl implements OnFinished { 
            return AudioManager.AUDIOFOCUS_REQUEST_FAILED;

        }



        AudioManager am = (AudioManager)mContext.getSystemService(Context.AUDIO_SERVICE);

        if (am.getStreamVolume(AudioManager.STREAM_NOTIFICATION) == 0

                && mainStreamType == AudioManager.STREAM_NOTIFICATION) {

            return AudioManager.AUDIOFOCUS_REQUEST_FAILED;

        }



        synchronized(mAudioFocusLock) {

            if (!canReassignAudioFocus()) {

                return AudioManager.AUDIOFOCUS_REQUEST_FAILED;