Merge "Fix NullPointerException in MediaPlayer"

am: c7c899bbe2 Change-Id: Iff261e6bd78c4f757ee0f7ae199710c9f92f0778
2017-01-04 17:27:48 +00:00
parent a169fc3494 c7c899bbe2
commit 15c9c1f8d1
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();