Merge \"MediaPlayer: fix java doc for setSurface and setDisplay.\" into nyc-dev
am: c6f39a0c36
Change-Id: I1c6dea8e60e96804c9d7564b367c21b146728072
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index a496823..c510483 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -709,6 +709,8 @@
* played.
*
* @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) {
mSurfaceHolder = sh;
@@ -739,6 +741,8 @@
*
* @param surface The {@link Surface} to be used for the video portion of
* the media.
+ * @throws IllegalStateException if the internal player engine has not been
+ * initialized or has been released.
*/
public void setSurface(Surface surface) {
if (mScreenOnWhilePlaying && surface != null) {