diff options
| author | 2016-09-16 00:24:14 +0000 | |
|---|---|---|
| committer | 2016-09-16 00:24:16 +0000 | |
| commit | b5cc0b55e36d4849cf7d2a976c000dd5aa2aec00 (patch) | |
| tree | b9e6edee1c0ad293d814791e99c3e44b42f15a9b | |
| parent | d5a6febfc434675b0917adc0a9fc69da299d84f6 (diff) | |
| parent | 295e7275458813795019d9bfb01610e177d2b43e (diff) | |
Merge "MediaPlayer: add comments of restriction for setNextMediaPlayer." into nyc-mr1-dev
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 31c7a3249542..e5f7527c9db2 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -1641,7 +1641,8 @@ public class MediaPlayer extends PlayerBase * (i.e. reaches the end of the stream). * The media framework will attempt to transition from this player to * the next as seamlessly as possible. The next player can be set at - * any time before completion. The next player must be prepared by the + * any time before completion, but shall be after setDataSource has been + * called successfully. The next player must be prepared by the * app, and the application should not call start() on it. * The next MediaPlayer must be different from 'this'. An exception * will be thrown if next == this. |