diff options
| author | 2017-01-04 17:37:17 +0000 | |
|---|---|---|
| committer | 2017-01-04 17:37:17 +0000 | |
| commit | cec9c42498793d69181d4f21a677405ca5c4b247 (patch) | |
| tree | ab4f57f31293d8b260e9fb0e8e2725d84bc21081 | |
| parent | a1a96763171f3fc532dd5be71922e5581445942c (diff) | |
| parent | 80713e98f7b87749e7691b9c3d123eaf6c3fa59a (diff) | |
Merge "Fix NullPointerException in MediaPlayer" am: c7c899bbe2 am: 15c9c1f8d1
am: 80713e98f7
Change-Id: Idbc93cea10adc0077341015ecd479baa76ae2c76
| -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(); |