Merge "Unhide new SoundPool API's. Bug 2415373."
diff --git a/api/current.xml b/api/current.xml
index eb1c6d6..1608ebf 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -84485,6 +84485,28 @@
<parameter name="srcQuality" type="int">
</parameter>
</constructor>
+<method name="autoPause"
+ return="void"
+ abstract="false"
+ native="true"
+ synchronized="false"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="autoResume"
+ return="void"
+ abstract="false"
+ native="true"
+ synchronized="false"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="load"
return="int"
abstract="false"
@@ -84626,6 +84648,19 @@
<parameter name="loop" type="int">
</parameter>
</method>
+<method name="setOnLoadCompleteListener"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="listener" type="android.media.SoundPool.OnLoadCompleteListener">
+</parameter>
+</method>
<method name="setPriority"
return="void"
abstract="false"
@@ -84700,6 +84735,31 @@
</parameter>
</method>
</class>
+<interface name="SoundPool.OnLoadCompleteListener"
+ abstract="true"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="onLoadComplete"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="soundPool" type="android.media.SoundPool">
+</parameter>
+<parameter name="sampleId" type="int">
+</parameter>
+<parameter name="status" type="int">
+</parameter>
+</method>
+</interface>
<class name="ThumbnailUtils"
extends="java.lang.Object"
abstract="false"
diff --git a/media/java/android/media/SoundPool.java b/media/java/android/media/SoundPool.java
index 62a4fe9..18ce5c1 100644
--- a/media/java/android/media/SoundPool.java
+++ b/media/java/android/media/SoundPool.java
@@ -327,8 +327,6 @@
* iterates through all the active streams and pauses any that
* are playing. It also sets a flag so that any streams that
* are playing can be resumed by calling autoResume().
- *
- * @hide
*/
public native final void autoPause();
@@ -337,8 +335,6 @@
*
* Automatically resumes all streams that were paused in previous
* calls to autoPause().
- *
- * @hide
*/
public native final void autoResume();
@@ -412,8 +408,6 @@
/**
* Interface definition for a callback to be invoked when all the
* sounds are loaded.
- *
- * @hide
*/
public interface OnLoadCompleteListener
{
@@ -429,8 +423,6 @@
/**
* Sets the callback hook for the OnLoadCompleteListener.
- *
- * @hide
*/
public void setOnLoadCompleteListener(OnLoadCompleteListener listener)
{