From 4a0029f95db144ba735b35e636400e8ce535383f Mon Sep 17 00:00:00 2001
From: Niko Catania <>
Date: Tue, 24 Mar 2009 19:51:09 -0700
Subject: [PATCH] Automated import from
 //branches/donutburger/...@141213,141213

---
 api/current.xml                           | 131 ++++++++++++++++++++++
 media/java/android/media/MediaPlayer.java |  12 +-
 2 files changed, 132 insertions(+), 11 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index d6887241b63ff..2260abb5abab1 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -66329,6 +66329,19 @@
 <parameter name="listener" type="android.media.MediaPlayer.OnErrorListener">
 </parameter>
 </method>
+<method name="setOnInfoListener"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="listener" type="android.media.MediaPlayer.OnInfoListener">
+</parameter>
+</method>
 <method name="setOnPreparedListener"
  return="void"
  abstract="false"
@@ -66355,6 +66368,19 @@
 <parameter name="listener" type="android.media.MediaPlayer.OnSeekCompleteListener">
 </parameter>
 </method>
+<method name="setOnVideoSizeChangedListener"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="listener" type="android.media.MediaPlayer.OnVideoSizeChangedListener">
+</parameter>
+</method>
 <method name="setScreenOnWhilePlaying"
  return="void"
  abstract="false"
@@ -66424,6 +66450,17 @@
 <exception name="IllegalStateException" type="java.lang.IllegalStateException">
 </exception>
 </method>
+<field name="MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="200"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="MEDIA_ERROR_SERVER_DIED"
  type="int"
  transient="false"
@@ -66446,6 +66483,50 @@
  visibility="public"
 >
 </field>
+<field name="MEDIA_INFO_BAD_INTERLEAVING"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="800"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="MEDIA_INFO_NOT_SEEKABLE"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="801"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="MEDIA_INFO_UNKNOWN"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="MEDIA_INFO_VIDEO_TRACK_LAGGING"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="700"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 </class>
 <interface name="MediaPlayer.OnBufferingUpdateListener"
  abstract="true"
@@ -66516,6 +66597,31 @@
 </parameter>
 </method>
 </interface>
+<interface name="MediaPlayer.OnInfoListener"
+ abstract="true"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="onInfo"
+ return="boolean"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="mp" type="android.media.MediaPlayer">
+</parameter>
+<parameter name="what" type="int">
+</parameter>
+<parameter name="extra" type="int">
+</parameter>
+</method>
+</interface>
 <interface name="MediaPlayer.OnPreparedListener"
  abstract="true"
  static="true"
@@ -66558,6 +66664,31 @@
 </parameter>
 </method>
 </interface>
+<interface name="MediaPlayer.OnVideoSizeChangedListener"
+ abstract="true"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="onVideoSizeChanged"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="mp" type="android.media.MediaPlayer">
+</parameter>
+<parameter name="width" type="int">
+</parameter>
+<parameter name="height" type="int">
+</parameter>
+</method>
+</interface>
 <class name="MediaRecorder"
  extends="java.lang.Object"
  abstract="false"
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 9668efac87100..19ab0add2b914 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -1131,8 +1131,6 @@ public class MediaPlayer
     /**
      * Interface definition of a callback to be invoked when the
      * video size is first known or updated
-     * FIXME: Unhide this API after approval
-     * @hide
      */
     public interface OnVideoSizeChangedListener
     {
@@ -1142,7 +1140,6 @@ public class MediaPlayer
          * @param mp        the MediaPlayer associated with this callback
          * @param width     the width of the video
          * @param height    the height of the video
-         * @hide
          */
         public void onVideoSizeChanged(MediaPlayer mp, int width, int height);
     }
@@ -1152,7 +1149,6 @@ public class MediaPlayer
      * known or updated.
      * 
      * @param listener the callback that will be run
-     * @hide
      */
     public void setOnVideoSizeChangedListener(OnVideoSizeChangedListener listener)
     {
@@ -1178,7 +1174,7 @@ public class MediaPlayer
     /** The video is streamed and its container is not valid for progressive
      * playback i.e the video's index (e.g moov atom) is not at the start of the
      * file.
-      * @hide pending API council approval. Replace with @see tag after.
+     * @see android.media.MediaPlayer.OnErrorListener
      */
     public static final int MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK = 200;
 
@@ -1226,14 +1222,12 @@ public class MediaPlayer
      */
     /** Unspecified media player info.
      * @see android.media.MediaPlayer.OnInfoListener
-     * @hide pending API council approval.
      */
     public static final int MEDIA_INFO_UNKNOWN = 1;
 
     /** The video is too complex for the decoder: it can't decode frames fast
      *  enough. Possibly only the audio plays fine at this stage.
      * @see android.media.MediaPlayer.OnInfoListener
-     * @hide pending API council approval.
      */
     public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700;
 
@@ -1241,20 +1235,17 @@ public class MediaPlayer
      * not interleaved at all, e.g has all the video samples first then all the
      * audio ones. Video is playing but a lot of disk seeks may be happening.
      * @see android.media.MediaPlayer.OnInfoListener
-     * @hide pending API council approval.
      */
     public static final int MEDIA_INFO_BAD_INTERLEAVING = 800;
 
     /** The media cannot be seeked (e.g live stream)
      * @see android.media.MediaPlayer.OnInfoListener
-     * @hide pending API council approval.
      */
     public static final int MEDIA_INFO_NOT_SEEKABLE = 801;
 
     /**
      * Interface definition of a callback to be invoked to communicate some
      * info and/or warning about the media or its playback.
-     * @hide pending API council approval.
      */
     public interface OnInfoListener
     {
@@ -1282,7 +1273,6 @@ public class MediaPlayer
      * Register a callback to be invoked when an info/warning is available.
      * 
      * @param listener the callback that will be run
-     * @hide pending API council approval.
      */
     public void setOnInfoListener(OnInfoListener listener)
     {