Merge "MediaPlayer: clean up subtitle controller log spam" into mnc-dev

diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index e3a6a83..3ee1959 100644 (file)
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -2270,8 +2270,8 @@ public class MediaPlayer implements SubtitleController.Listener
 
     private void scanInternalSubtitleTracks() {
         if (mSubtitleController == null) {
-            Log.e(TAG, "Should have subtitle controller already set");
-            return;
+            Log.w(TAG, "setSubtitleAnchor in MediaPlayer");
+            setSubtitleAnchor();
         }
 
         TrackInfo[] tracks = getInbandTrackInfo();