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

Commit 2af9dc5e authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Unhide MediaPlayer.setNextMediaPlayer"

parents 47324e94 467ec7ed

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10891,6 +10891,7 @@ package android.media { 
    method public void setDataSource(java.io.FileDescriptor, long, long) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;

    method public void setDisplay(android.view.SurfaceHolder);

    method public void setLooping(boolean);

    method public void setNextMediaPlayer(android.media.MediaPlayer);

    method public void setOnBufferingUpdateListener(android.media.MediaPlayer.OnBufferingUpdateListener);

    method public void setOnCompletionListener(android.media.MediaPlayer.OnCompletionListener);

    method public void setOnErrorListener(android.media.MediaPlayer.OnErrorListener);

media/java/android/media/MediaPlayer.java

+0 −1
Original line number Diff line number Diff line
@@ -1170,7 +1170,6 @@ public class MediaPlayer 
     *

     * @param next the player to start after this one completes playback.

     *

     * @hide

     */

    public native void setNextMediaPlayer(MediaPlayer next);