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

Commit c450d140 authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

Merge changes from topic "am-9e4fa925-b00a-40e6-8fb0-e5a4244e6284" into oc-dev... 

Merge changes from topic "am-9e4fa925-b00a-40e6-8fb0-e5a4244e6284" into oc-dev am: e43837e2 am: dccb62bc
am: 64cb4be8

Change-Id: Id7d4599c5d7d7c803e86afa88be582773c80741f
parents 632c036d 64cb4be8

media/java/android/media/MediaPlayer.java

+1 −1
Original line number Diff line number Diff line
@@ -2510,10 +2510,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));