Merge "Fix NullPointerException in MediaPlayer"

2017-01-04 17:23:06 +00:00
parent 871beedc6d 30d4a498c4
commit c7c899bbe2
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();