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

Commit 87d84cc4 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am 1f1abf34: am 5c5e1fb3: am e6b874b1: Merge "Fix reading attributes for... 

am 1f1abf34: am 5c5e1fb3: am e6b874b1: Merge "Fix reading attributes for playback restrictions" into mnc-dev

* commit '1f1abf34':
  Fix reading attributes for playback restrictions
parents b72bf31b 1f1abf34

media/java/android/media/AudioTrack.java

+1 −1
Original line number Diff line number Diff line
@@ -1519,7 +1519,7 @@ public class AudioTrack 
    }



    private boolean isRestricted() {

        if ((mAttributes.getFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) {

        if ((mAttributes.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) {

            return false;

        }

        try {

media/java/android/media/MediaPlayer.java

+1 −1
Original line number Diff line number Diff line
@@ -1757,7 +1757,7 @@ public class MediaPlayer implements SubtitleController.Listener 
            throw new IllegalArgumentException(msg);

        }

        mUsage = attributes.getUsage();

        mBypassInterruptionPolicy = (attributes.getFlags()

        mBypassInterruptionPolicy = (attributes.getAllFlags()

                & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0;

        Parcel pattributes = Parcel.obtain();

        attributes.writeToParcel(pattributes, AudioAttributes.FLATTEN_TAGS);

media/java/android/media/SoundPool.java

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ public class SoundPool { 
    }



    private boolean isRestricted() {

        if ((mAttributes.getFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) {

        if ((mAttributes.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) {

            return false;

        }

        try {