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

Commit a9d5bf49 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "MediaPLayer: remove unused code" into qt-dev 

am: 1b623630

Change-Id: Ib9f078319d03a3b176a17837a575a08f1c1e6bb8
parents 5015204a 1b623630

media/java/android/media/MediaPlayer.java

+0 −3
Original line number Diff line number Diff line
@@ -629,7 +629,6 @@ public class MediaPlayer extends PlayerBase 
    private boolean mStayAwake;

    private int mStreamType = AudioManager.USE_DEFAULT_STREAM_TYPE;

    private int mUsage = -1;

    private boolean mBypassInterruptionPolicy;



    // Modular DRM

    private UUID mDrmUUID;
@@ -2218,8 +2217,6 @@ public class MediaPlayer extends PlayerBase 
        }

        baseUpdateAudioAttributes(attributes);

        mUsage = attributes.getUsage();

        mBypassInterruptionPolicy = (attributes.getAllFlags()

                & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0;

        Parcel pattributes = Parcel.obtain();

        attributes.writeToParcel(pattributes, AudioAttributes.FLATTEN_TAGS);

        setParameter(KEY_PARAMETER_AUDIO_ATTRIBUTES, pattributes);