Merge "Fix NullPointerException in MediaPlayer" am: c7c899bbe2

am: 15c9c1f8d1 Change-Id: I313f483e69e098252cf1b753aa5f6b38945d9669
2017-01-04 17:32:20 +00:00
parent 8be80273b8 15c9c1f8d1
commit 80713e98f7
1 changed files with 1 additions and 4 deletions
--- 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();