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

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

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

* changes:
  [automerger] Fix TrackInfo parcel write am: 0d2dc943 am: 00b57fc9 am: 1bce1217 am: 47c831e6 am: d6143e93
  [automerger] Fix TrackInfo parcel write am: 0d2dc943 am: 00b57fc9 am: 1bce1217 am: 47c831e6
  [automerger] Fix TrackInfo parcel write am: 0d2dc943 am: 00b57fc9 am: 1bce1217
  [automerger] Fix TrackInfo parcel write am: 0d2dc943 am: 00b57fc9
  [automerger] Fix TrackInfo parcel write am: 0d2dc943
  Fix TrackInfo parcel write
parents 8f1c70e4 7b414ce7

media/java/android/media/MediaPlayer.java

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