Merge "Fix NullPointerException in MediaPlayer" am: c7c899bbe2 am: 15c9c1f8d1 am: 80713e98f7

am: cec9c42498 Change-Id: I19ca9ac969eca57981fd00dcc89f6fa1c724650a
2017-01-04 17:41:53 +00:00
parent a5e50e2612 cec9c42498
commit e5fb79bb2d
1 changed files with 1 additions and 4 deletions
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -2442,10 +2442,7 @@ public class MediaPlayer extends PlayerBase
    }

    private void scanInternalSubtitleTracks() {
-        if (mSubtitleController == null) {
-            Log.d(TAG, "setSubtitleAnchor in MediaPlayer");
-            setSubtitleAnchor();
-        }
+        setSubtitleAnchor();

        populateInbandTracks();