summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-03-29 15:48:45 -0700
committerkmccormick <kmccormick@google.com>2013-03-29 15:50:03 -0700
commitb04c07fb9b105fe55ea261283d0be2c817133d67 (patch)
tree7042fe6660149cef90a01b4faed7676fd1286add /media/java
parent689e827aa3fa69d20087972dfb93ed257e4d109b (diff)
downloadframeworks_base-b04c07fb9b105fe55ea261283d0be2c817133d67.zip
frameworks_base-b04c07fb9b105fe55ea261283d0be2c817133d67.tar.gz
frameworks_base-b04c07fb9b105fe55ea261283d0be2c817133d67.tar.bz2
Doc update: PlaybackCompleted valid state 4 pause
"Bug: 7962402" Change-Id: Ie41d7085373794e98208d8815010b3ca1d81378c
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/MediaPlayer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index ef0da3a..7c547ec 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>