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

Merge "MediaPlayer: fix java doc for setSurface and setDisplay." into nyc-dev

Browse Source
This commit is contained in:
Wei Jia
2016-06-14 18:50:00 +00:00
committed by Android (Google) Code Review
parent f2d5d876b9 77e351f81e
commit c6f39a0c36
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -709,6 +709,8 @@ public class MediaPlayer extends PlayerBase
* played. * played.
* *
* @param sh the SurfaceHolder to use for video display * @param sh the SurfaceHolder to use for video display
* @throws IllegalStateException if the internal player engine has not been
* initialized or has been released.
*/ */
public void setDisplay(SurfaceHolder sh) { public void setDisplay(SurfaceHolder sh) {
mSurfaceHolder = sh; mSurfaceHolder = sh;
@@ -739,6 +741,8 @@ public class MediaPlayer extends PlayerBase
* *
* @param surface The {@link Surface} to be used for the video portion of * @param surface The {@link Surface} to be used for the video portion of
* the media. * the media.
* @throws IllegalStateException if the internal player engine has not been
* initialized or has been released.
*/ */
public void setSurface(Surface surface) { public void setSurface(Surface surface) {
if (mScreenOnWhilePlaying && surface != null) { if (mScreenOnWhilePlaying && surface != null) {