commit e43837e258a45607b98c366fa933b8c2682a0127
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jul 16 19:25:14 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 16 19:25:14 2018 +0000
tree 493de619ff05f9c63ad18a2ce8afa99dc057c91d
parent 8f1c70e49b9553e604ea2d4ae14eb7d162263c51
parent 7b414ce71081647bc336db76cc8cb35854cf0105

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

* changes:
  [automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7 am: 1bce1217ca am: 47c831e675 am: d6143e9307
  [automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7 am: 1bce1217ca am: 47c831e675
  [automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7 am: 1bce1217ca
  [automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7
  [automerger] Fix TrackInfo parcel write am: 0d2dc943dc
  Fix TrackInfo parcel write

media/java/android/media/MediaPlayer.java

diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 5cbccea..2c6ca5f 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -2344,10 +2344,10 @@
         @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));