Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaPlayer: fix java doc for setPlaybackParams." into nyc-dev

Browse Source
This commit is contained in:
Wei Jia
2016-06-20 22:58:32 +00:00
committed by Android (Google) Code Review
parent f00e780472 ce4957eb37
commit bd45be5032
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
media/java/android/media/MediaPlayer.java
View File

@@ -476,10 +476,10 @@ import java.lang.ref.WeakReference;
* <td>This method can be called in any state and calling it does not change * <td>This method can be called in any state and calling it does not change
* the object state. </p></td></tr> * the object state. </p></td></tr>
* <tr><td>setPlaybackParams</p></td> * <tr><td>setPlaybackParams</p></td>
* <td>any </p></td> * <td>{Initialized, Prepared, Started, Paused, PlaybackCompleted, Error}</p></td>
* <td>{} </p></td> * <td>{Idle, Stopped} </p></td>
* <td>This method can be called in any state and calling it does not change * <td>This method will change state in some cases, depending on when it's called.
* the object state. </p></td></tr> * </p></td></tr>
* <tr><td>setScreenOnWhilePlaying</></td> * <tr><td>setScreenOnWhilePlaying</></td>
* <td>any </p></td> * <td>any </p></td>
* <td>{} </p></td> * <td>{} </p></td>
@@ -1449,12 +1449,18 @@ public class MediaPlayer extends PlayerBase
} }
/** /**
* Sets playback rate using {@link PlaybackParams}. * Sets playback rate using {@link PlaybackParams}. The object sets its internal
* PlaybackParams to the input, except that the object remembers previous speed
* when input speed is zero. This allows the object to resume at previous speed
* when start() is called. Calling it before the object is prepared does not change
* the object state. After the object is prepared, calling it with zero speed is
* equivalent to calling pause(). After the object is prepared, calling it with
* non-zero speed is equivalent to calling start().
* *
* @param params the playback params. * @param params the playback params.
* *
* @throws IllegalStateException if the internal player engine has not been * @throws IllegalStateException if the internal player engine has not been
* initialized. * initialized or has been released.
* @throws IllegalArgumentException if params is not supported. * @throws IllegalArgumentException if params is not supported.
*/ */
public native void setPlaybackParams(@NonNull PlaybackParams params); public native void setPlaybackParams(@NonNull PlaybackParams params);