Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 444ad3fb: Merge "Unhide SoundPool builder with AudioAttributes" into lmp-dev

Browse Source 
* commit '444ad3fb4d0d0327528b217ec97b5e9c73b22d65':
  Unhide SoundPool builder with AudioAttributes
This commit is contained in:
Jean-Michel Trivi
2014-07-22 00:36:33 +00:00
committed by Android Git Automerger
parent ebac7e72a6 0d964e77b9
commit 6872f50f39
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/current.txt
View File

@@ -15677,7 +15677,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);
@@ -15697,6 +15697,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);
}

6
media/java/android/media/SoundPool.java
View File

@@ -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;