diff options
| author | 2013-03-29 16:04:09 -0700 | |
|---|---|---|
| committer | 2013-03-29 16:04:09 -0700 | |
| commit | be1339edc445eef19c3aa880b51a5c500cab6f82 (patch) | |
| tree | 330f5d9cab8aa7f4ca4e256cb22fcc2c5f716585 | |
| parent | a92ca7fa3ec630aee14e51d87851749956bad875 (diff) | |
| parent | 328f7b7160d4c5a30c6810cbcd4aa01bb7b57dda (diff) | |
am 328f7b71: am 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit '328f7b7160d4c5a30c6810cbcd4aa01bb7b57dda':
Doc update: PlaybackCompleted valid state 4 pause
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 11f41808c618..85a32caba65a 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -328,8 +328,8 @@ import java.lang.ref.WeakReference; * the state. Calling this method in an invalid state transfers the * object to the <em>Error</em> state. </p></td></tr> * <tr><td>pause </p></td> - * <td>{Started, Paused}</p></td> - * <td>{Idle, Initialized, Prepared, Stopped, PlaybackCompleted, Error}</p></td> + * <td>{Started, Paused, PlaybackCompleted}</p></td> + * <td>{Idle, Initialized, Prepared, Stopped, Error}</p></td> * <td>Successful invoke of this method in a valid state transfers the * object to the <em>Paused</em> state. Calling this method in an * invalid state transfers the object to the <em>Error</em> state.</p></td></tr> |