diff options
| author | Marco Nelissen <marcone@google.com> | 2012-03-14 16:00:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-14 16:00:19 -0700 |
| commit | 2af9dc5ecc118390020dd9eeaa4878e39f7b1b7d (patch) | |
| tree | 0e322d2dd38a0ea8bb79f755c59024067c775319 | |
| parent | 47324e940abbcdf420ec3a28d186d558ecdbb87a (diff) | |
| parent | 467ec7eda8ad754d6a92d32040738b797ba5e994 (diff) | |
| download | frameworks_base-2af9dc5ecc118390020dd9eeaa4878e39f7b1b7d.zip frameworks_base-2af9dc5ecc118390020dd9eeaa4878e39f7b1b7d.tar.gz frameworks_base-2af9dc5ecc118390020dd9eeaa4878e39f7b1b7d.tar.bz2 | |
Merge "Unhide MediaPlayer.setNextMediaPlayer"
| -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 0e3fee6..6bac58a 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 4e6c174..f5fa877 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); |