Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be1339ed authored by kmccormick's avatar kmccormick Committed by Android Git Automerger
Browse files

am 328f7b71: am 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc... 

am 328f7b71: am 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs

* commit '328f7b71':
  Doc update: PlaybackCompleted valid state 4 pause
parents a92ca7fa 328f7b71

media/java/android/media/MediaPlayer.java

+2 −2
Original line number Diff line number Diff line
@@ -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>