summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-07-03 17:39:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-03 17:39:25 -0700
commit7b5488d85d8ed36c42a821fb0064de741cca35c9 (patch)
tree0b79ec7028e399c49e6c1f327b9b2904a676a334
parent33715d1434ec7070afaffed19214e96fd4f1363d (diff)
parent099fd80f984b8493de58bdda8ea05563261b0af2 (diff)
downloadframeworks_base-7b5488d85d8ed36c42a821fb0064de741cca35c9.zip
frameworks_base-7b5488d85d8ed36c42a821fb0064de741cca35c9.tar.gz
frameworks_base-7b5488d85d8ed36c42a821fb0064de741cca35c9.tar.bz2
am 099fd80f: docs: add throws notice for isPlaying per external issue 33610
* commit '099fd80f984b8493de58bdda8ea05563261b0af2': docs: add throws notice for isPlaying per external issue 33610
-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();