summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-07-03 17:42:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-03 17:42:37 -0700
commit9b52b9c83d4b39c22c0e90d982c145282d829363 (patch)
tree2136840ffbe7872daaef5d098e9a28b91b096e1a /media
parent86fc2c9b742da47acd7f37114ecc6f076dc21c5c (diff)
parent7b5488d85d8ed36c42a821fb0064de741cca35c9 (diff)
downloadframeworks_base-9b52b9c83d4b39c22c0e90d982c145282d829363.zip
frameworks_base-9b52b9c83d4b39c22c0e90d982c145282d829363.tar.gz
frameworks_base-9b52b9c83d4b39c22c0e90d982c145282d829363.tar.bz2
am 7b5488d8: am 099fd80f: docs: add throws notice for isPlaying per external issue 33610
* commit '7b5488d85d8ed36c42a821fb0064de741cca35c9': docs: add throws notice for isPlaying per external issue 33610
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaPlayer.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 586f11e..e76d25a 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -1152,6 +1152,8 @@ public class MediaPlayer
* Checks whether the MediaPlayer is playing.
*
* @return true if currently playing, false otherwise
+ * @throws IllegalStateException if the internal player engine has not been
+ * initialized or has been released.
*/
public native boolean isPlaying();