diff options
| author | 2017-01-04 17:32:20 +0000 | |
|---|---|---|
| committer | 2017-01-04 17:32:20 +0000 | |
| commit | 80713e98f7b87749e7691b9c3d123eaf6c3fa59a (patch) | |
| tree | e025756007beb7934e0d845ed1b549a52add609c | |
| parent | 8be80273b88afc85bd106af73bc3f91f6e3c3121 (diff) | |
| parent | 15c9c1f8d13ab7103e27f015eacc42166eb6f717 (diff) | |
Merge "Fix NullPointerException in MediaPlayer" am: c7c899bbe2
am: 15c9c1f8d1
Change-Id: I313f483e69e098252cf1b753aa5f6b38945d9669
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 949acc0e1758..d0f8b73bbbeb 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -2336,10 +2336,7 @@ public class MediaPlayer extends PlayerBase } private void scanInternalSubtitleTracks() { - if (mSubtitleController == null) { - Log.d(TAG, "setSubtitleAnchor in MediaPlayer"); - setSubtitleAnchor(); - } + setSubtitleAnchor(); populateInbandTracks(); |