diff options
| author | 2018-07-16 19:25:14 +0000 | |
|---|---|---|
| committer | 2018-07-16 19:25:14 +0000 | |
| commit | b794b4cb9e5c541ef6142f689bcbe70aa56829f5 (patch) | |
| tree | d7d8ea6cacf754334ee63906893e166564ed2c8a | |
| parent | abe5a73a4a81e312a1690fbc10a6b99ce98b699a (diff) | |
| parent | 0d2dc943dcaa3d7c8479e22ae62be9753ea2643c (diff) | |
Merge "Fix TrackInfo parcel write" into nyc-dev
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 8d4a1510715a..67a99ac9752b 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -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)); |