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

Commit b794b4cb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix TrackInfo parcel write" into nyc-dev

parents abe5a73a 0d2dc943

media/java/android/media/MediaPlayer.java

+1 −1
Original line number Diff line number Diff line
@@ -2024,10 +2024,10 @@ public class MediaPlayer extends PlayerBase 
        @Override

        public void writeToParcel(Parcel dest, int flags) {

            dest.writeInt(mTrackType);

            dest.writeString(mFormat.getString(MediaFormat.KEY_MIME));

            dest.writeString(getLanguage());



            if (mTrackType == MEDIA_TRACK_TYPE_SUBTITLE) {

                dest.writeString(mFormat.getString(MediaFormat.KEY_MIME));

                dest.writeInt(mFormat.getInteger(MediaFormat.KEY_IS_AUTOSELECT));

                dest.writeInt(mFormat.getInteger(MediaFormat.KEY_IS_DEFAULT));

                dest.writeInt(mFormat.getInteger(MediaFormat.KEY_IS_FORCED_SUBTITLE));