diff options
| author | Robert Shih <robertshih@google.com> | 2015-05-16 01:08:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-16 01:08:53 +0000 |
| commit | 89942588b7b89bd83c39e91236cafcc5f6775b5f (patch) | |
| tree | b1e884c9188467a107a1847e4dda82ae64032276 | |
| parent | a91a6f68f4c2564f763d28a3cfcd9d8b7a3f5db9 (diff) | |
| parent | 1973189fe0baa9b132c9b7f87a8ee1e1b234265a (diff) | |
| download | frameworks_base-89942588b7b89bd83c39e91236cafcc5f6775b5f.zip frameworks_base-89942588b7b89bd83c39e91236cafcc5f6775b5f.tar.gz frameworks_base-89942588b7b89bd83c39e91236cafcc5f6775b5f.tar.bz2 | |
Merge "MediaPlayer: clean up subtitle controller log spam" into mnc-dev
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index e3a6a83..3ee1959 100644 --- 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(); |