diff options
| author | Robert Shih <robertshih@google.com> | 2018-07-09 13:38:31 -0700 |
|---|---|---|
| committer | Tim Schumacher <timschumi@gmx.de> | 2018-10-22 21:11:42 +0200 |
| commit | e5be5ab6819f948ebba0168637a5694ddf9120d5 (patch) | |
| tree | e09ff52c4b783b4fb16152204851d363c703d830 | |
| parent | cced0f3211db5d36d288717816c8d2898531fe49 (diff) | |
| download | frameworks_base-e5be5ab6819f948ebba0168637a5694ddf9120d5.tar.gz frameworks_base-e5be5ab6819f948ebba0168637a5694ddf9120d5.tar.bz2 frameworks_base-e5be5ab6819f948ebba0168637a5694ddf9120d5.zip | |
Fix TrackInfo parcel write
Bug: 77600398
Change-Id: Ia316f1c5dc4879f6851fdb78fe8b9039579be7bc
(cherry picked from commit 0d2dc943dcaa3d7c8479e22ae62be9753ea2643c)
| -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 b3f25eea565..4a7f5a4243c 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -1992,10 +1992,10 @@ public class MediaPlayer implements SubtitleController.Listener @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)); |