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

* commit '5c5c3f3abd8a95bf46378fd93b13160ad52e74ff':
  Document that MediaPlayer.getDuration() returns an invalid value (-1)
This commit is contained in:
Andreas Huber
2013-04-15 08:34:34 -07:00
committed by Android Git Automerger

View File

@@ -1181,7 +1181,8 @@ public class MediaPlayer
/** /**
* Gets the duration of the file. * 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(); public native int getDuration();