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

Commit e1112980 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Add javadoc" into nyc-dev 

am: 5b6fd0fc

* commit '5b6fd0fc':
  Add javadoc

Change-Id: I455d7402062c061debf16aeaa6c112053d67660f
parents c7f1e02d 5b6fd0fc

media/java/android/media/MediaPlayer.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -1107,6 +1107,9 @@ public class MediaPlayer implements SubtitleController.Listener 
     * as this call returns.

     * as this call returns.

     *

     *

     * @param afd the AssetFileDescriptor for the file you want to play

     * @param afd the AssetFileDescriptor for the file you want to play

     * @throws IllegalStateException if it is called in an invalid state

     * @throws IllegalArgumentException if afd is not a valid AssetFileDescriptor

     * @throws IOException if afd can not be read

     */

     */

    public void setDataSource(@NonNull AssetFileDescriptor afd)

    public void setDataSource(@NonNull AssetFileDescriptor afd)

            throws IOException, IllegalArgumentException, IllegalStateException {

            throws IOException, IllegalArgumentException, IllegalStateException {
@@ -1127,6 +1130,8 @@ public class MediaPlayer implements SubtitleController.Listener 
     *

     *

     * @param fd the FileDescriptor for the file you want to play

     * @param fd the FileDescriptor for the file you want to play

     * @throws IllegalStateException if it is called in an invalid state

     * @throws IllegalStateException if it is called in an invalid state

     * @throws IllegalArgumentException if fd is not a valid FileDescriptor

     * @throws IOException if fd can not be read

     */

     */

    public void setDataSource(FileDescriptor fd)

    public void setDataSource(FileDescriptor fd)

            throws IOException, IllegalArgumentException, IllegalStateException {

            throws IOException, IllegalArgumentException, IllegalStateException {
@@ -1143,6 +1148,8 @@ public class MediaPlayer implements SubtitleController.Listener 
     * @param offset the offset into the file where the data to be played starts, in bytes

     * @param offset the offset into the file where the data to be played starts, in bytes

     * @param length the length in bytes of the data to be played

     * @param length the length in bytes of the data to be played

     * @throws IllegalStateException if it is called in an invalid state

     * @throws IllegalStateException if it is called in an invalid state

     * @throws IllegalArgumentException if fd is not a valid FileDescriptor

     * @throws IOException if fd can not be read

     */

     */

    public void setDataSource(FileDescriptor fd, long offset, long length)

    public void setDataSource(FileDescriptor fd, long offset, long length)

            throws IOException, IllegalArgumentException, IllegalStateException {

            throws IOException, IllegalArgumentException, IllegalStateException {
@@ -1157,6 +1164,7 @@ public class MediaPlayer implements SubtitleController.Listener 
     *

     *

     * @param dataSource the MediaDataSource for the media you want to play

     * @param dataSource the MediaDataSource for the media you want to play

     * @throws IllegalStateException if it is called in an invalid state

     * @throws IllegalStateException if it is called in an invalid state

     * @throws IllegalArgumentException if dataSource is not a valid MediaDataSource

     */

     */

    public void setDataSource(MediaDataSource dataSource)

    public void setDataSource(MediaDataSource dataSource)

            throws IllegalArgumentException, IllegalStateException {

            throws IllegalArgumentException, IllegalStateException {