diff options
| author | 2013-03-29 15:57:32 -0700 | |
|---|---|---|
| committer | 2013-03-29 15:57:32 -0700 | |
| commit | 23b55e78c86b09e806790d4f3ee47646216a9b87 (patch) | |
| tree | a86cbdf4c5a8ea16e5f8aa933825166da4ee4f6d | |
| parent | 75fa3012467117933d6afb7353b1c027bd446b72 (diff) | |
| parent | 3fab60bddb4ae719185f884ad167e5f16eaa4314 (diff) | |
am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit '3fab60bddb4ae719185f884ad167e5f16eaa4314':
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 ef0da3a1de7b..7c547ec54b58 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> |