Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev

2013-04-15 15:15:41 +00:00
parent 330a9fe323 7cd281c332
commit 5c5c3f3abd
1 changed files with 2 additions and 1 deletions
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -1181,7 +1181,8 @@ public class MediaPlayer
    /**
     * Gets the duration of the file.
     *
-     * @return the duration in milliseconds
+     * @return the duration in milliseconds, if no duration is available
+     *         (for example, if streaming live content), -1 is returned.
     */
    public native int getDuration();