Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baf4a057 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invalid... 

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

* commit '5c5c3f3a':
  Document that MediaPlayer.getDuration() returns an invalid value (-1)
parents c4294ed2 5c5c3f3a

media/java/android/media/MediaPlayer.java

+2 −1
Original line number Diff line number Diff line
@@ -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();