diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 0e3fee64c667..6bac58af167a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 4e6c17480964..f5fa877c97d3 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -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); |