Automated import from //branches/donutburger/...@140811,140811

api/current.xml

@@ -64924,6 +64924,23 @@
  visibility="public"
 >
 </method>
+<method name="getMinBufferSize"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="sampleRateInHz" type="int">
+</parameter>
+<parameter name="channelConfig" type="int">
+</parameter>
+<parameter name="audioFormat" type="int">
+</parameter>
+</method>
 <method name="getMinVolume"
  return="float"
  abstract="false"
@@ -64992,6 +65009,17 @@
  visibility="public"
 >
 </method>
+<method name="getPlaybackRate"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getPositionNotificationPeriod"
  return="int"
  abstract="false"

media/java/android/media/AudioTrack.java

@@ -423,7 +423,6 @@ public class AudioTrack
     }
     
     /**
-     * @hide
      * Returns the current playback rate in Hz. Note that this rate may differ from one set using
      * {@link #setPlaybackRate(int)} as the value effectively set is implementation-dependent.
      */
@@ -522,7 +521,6 @@ public class AudioTrack
     }
     
     /**
-     * {@hide}
      * Returns the minimum buffer size required for the successful creation of an AudioTrack
      * object to be created in the {@link #MODE_STREAM} mode.
      * @param sampleRateInHz the sample rate expressed in Hertz.