summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-12-07 23:05:03 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-12-07 23:05:03 -0800
commit1321bc1fa3e6dcafcf3185b4efe2f9721ecdfef1 (patch)
tree3754791182b2fb44d087b90412a0f1641d27caba
parent9650b018e3b1ed42de9b48f3c0eaf4e04733f065 (diff)
parentca402cdcacfdcd2978a22d59f446c93aad34c75e (diff)
downloadframeworks_base-1321bc1fa3e6dcafcf3185b4efe2f9721ecdfef1.zip
frameworks_base-1321bc1fa3e6dcafcf3185b4efe2f9721ecdfef1.tar.gz
frameworks_base-1321bc1fa3e6dcafcf3185b4efe2f9721ecdfef1.tar.bz2
Merge "Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed to the callback could be 0."
-rw-r--r--media/java/android/media/MediaPlayer.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 8d71dcf..4c70e9d 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -1735,6 +1735,9 @@ public class MediaPlayer
/**
* Called to indicate the video size
*
+ * The video size (width and height) could be 0 if there was no video,
+ * no display surface was set, or the value was not determined yet.
+ *
* @param mp the MediaPlayer associated with this callback
* @param width the width of the video
* @param height the height of the video