summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-03-29 15:17:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-29 15:17:47 -0700
commit5c8eff3308c79f25bfe07d00c214f665581e5d7e (patch)
treea72003ab3ae040a6678745b1b01821902fc87d77 /media
parent30ec6c2bf587b1525ab4c2de66f31349b574641c (diff)
parentc36b3c6956479f1a154fe1e08b679ff4657097e1 (diff)
downloadframeworks_base-5c8eff3308c79f25bfe07d00c214f665581e5d7e.zip
frameworks_base-5c8eff3308c79f25bfe07d00c214f665581e5d7e.tar.gz
frameworks_base-5c8eff3308c79f25bfe07d00c214f665581e5d7e.tar.bz2
Merge "Fix missing cross-ref links in the MediaPlayer.java javadoc"
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaPlayer.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index fcbe59e..e2dee00 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -1616,10 +1616,12 @@ public class MediaPlayer
/** MediaPlayer is temporarily pausing playback internally in order to
* buffer more data.
+ * @see android.media.MediaPlayer.OnInfoListener
*/
public static final int MEDIA_INFO_BUFFERING_START = 701;
/** MediaPlayer is resuming playback after filling buffers.
+ * @see android.media.MediaPlayer.OnInfoListener
*/
public static final int MEDIA_INFO_BUFFERING_END = 702;
@@ -1654,6 +1656,8 @@ public class MediaPlayer
* <ul>
* <li>{@link #MEDIA_INFO_UNKNOWN}
* <li>{@link #MEDIA_INFO_VIDEO_TRACK_LAGGING}
+ * <li>{@link #MEDIA_INFO_BUFFERING_START}
+ * <li>{@link #MEDIA_INFO_BUFFERING_END}
* <li>{@link #MEDIA_INFO_BAD_INTERLEAVING}
* <li>{@link #MEDIA_INFO_NOT_SEEKABLE}
* <li>{@link #MEDIA_INFO_METADATA_UPDATE}