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

Commit 507537ee 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 am: c450d140
am: deb8dbad

Change-Id: I15c3a600ff4e4802254bb41d4903eec10583febc
parents a4dd6efd deb8dbad

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));