Unhide SoundPool builder with AudioAttributes

Change-Id: I9ec6ca310a342f72cc1a0de5d93fe650b0ca2125

2 files changed, 11 insertions, 4 deletions

diff --git a/api/current.txt b/api/current.txt
index 001d9b99fa8e..5afce29033ab 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15668,7 +15668,7 @@ package android.media {
   }
 
   public class SoundPool {
-    ctor public SoundPool(int, int, int);
+    ctor public deprecated SoundPool(int, int, int);
     method public final void autoPause();
     method public final void autoResume();
     method public int load(java.lang.String, int);
@@ -15688,6 +15688,13 @@ package android.media {
     method public final boolean unload(int);
   }
 
+  public static class SoundPool.Builder {
+    ctor public SoundPool.Builder();
+    method public android.media.SoundPool build();
+    method public android.media.SoundPool.Builder setAudioAttributes(android.media.AudioAttributes) throws java.lang.IllegalArgumentException;
+    method public android.media.SoundPool.Builder setMaxStreams(int) throws java.lang.IllegalArgumentException;
+  }
+
   public static abstract interface SoundPool.OnLoadCompleteListener {
     method public abstract void onLoadComplete(android.media.SoundPool, int, int);
   }
diff --git a/media/java/android/media/SoundPool.java b/media/java/android/media/SoundPool.java
index 56079ad42c72..9b9c76791f7e 100644
--- a/media/java/android/media/SoundPool.java
+++ b/media/java/android/media/SoundPool.java
@@ -126,6 +126,8 @@ public class SoundPool {
      * @param srcQuality the sample-rate converter quality. Currently has no
      *                   effect. Use 0 for the default.
      * @return a SoundPool object, or null if creation failed
+     * @deprecated use {@link SoundPool.Builder} instead to create and configure a
+     *     SoundPool instance
      */
     public SoundPool(int maxStreams, int streamType, int srcQuality) {
         this(maxStreams,
@@ -141,8 +143,6 @@ public class SoundPool {
     }
 
     /**
-     * @hide
-     * CANDIDATE FOR PUBLIC API
      * Builder class for {@link SoundPool} objects.
      */
     public static class Builder {
@@ -164,7 +164,7 @@ public class SoundPool {
         public Builder setMaxStreams(int maxStreams) throws IllegalArgumentException {
             if (maxStreams <= 0) {
                 throw new IllegalArgumentException(
-                        "Strictly position value required for the maximum number of streams");
+                        "Strictly positive value required for the maximum number of streams");
             }
             mMaxStreams = maxStreams;
             return this;