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

Commit 57ad0703 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when... 

am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo

Merge commit 'c40209ac' into kraken

* commit 'c40209ac':
  Fix a Javadoc to clarify when setAudioStreamType() should be called.
parents 15fe2cb7 c40209ac

media/java/android/media/MediaPlayer.java

+6 −2
Original line number Diff line number Diff line
@@ -344,7 +344,9 @@ import java.lang.ref.WeakReference; 
 *     <td>{Idle, Initialized, Stopped, Prepared, Started, Paused,

 *          PlaybackCompleted}</p></td>

 *     <td>{Error}</p></td>

 *     <td>Successful invoke of this method does not change the state.</p></td></tr>

 *     <td>Successful invoke of this method does not change the state. In order for the

 *         target audio stream type to become effective, this method must be called before

 *         prepare() or prepareAsync().</p></td></tr>

 * <tr><td>setDataSource </p></td>

 *     <td>{Idle} </p></td>

 *     <td>{Initialized, Prepared, Started, Paused, Stopped, PlaybackCompleted,
@@ -1112,7 +1114,9 @@ public class MediaPlayer 


    /**

     * Sets the audio stream type for this MediaPlayer. See {@link AudioManager}

     * for a list of stream types.

     * for a list of stream types. Must call this method before prepare() or

     * prepareAsync() in order for the target stream type to become effective

     * thereafter.

     *

     * @param streamtype the audio stream type

     * @see android.media.AudioManager