summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-08-27 18:23:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-27 18:23:00 +0000
commitc0dce273a8af0263b660b57c1a05395a0bd2d2e5 (patch)
treeb0cf730e16091663d3decfe6674f9560d5bd6f04 /media
parenta9bdc43ec2b8862db579aaced357184b7496468f (diff)
parent2d17128f6e9954a818a71513ad6da4180e95356b (diff)
downloadframeworks_base-c0dce273a8af0263b660b57c1a05395a0bd2d2e5.zip
frameworks_base-c0dce273a8af0263b660b57c1a05395a0bd2d2e5.tar.gz
frameworks_base-c0dce273a8af0263b660b57c1a05395a0bd2d2e5.tar.bz2
Merge "SoundPool.Builder: document default values" into lmp-dev
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/SoundPool.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/java/android/media/SoundPool.java b/media/java/android/media/SoundPool.java
index 9b9c767..4f74bdd 100644
--- a/media/java/android/media/SoundPool.java
+++ b/media/java/android/media/SoundPool.java
@@ -151,6 +151,10 @@ public class SoundPool {
/**
* Constructs a new Builder with the defaults format values.
+ * If not provided, the maximum number of streams is 1 (see {@link #setMaxStreams(int)} to
+ * change it), and the audio attributes have a usage value of
+ * {@link AudioAttributes#USAGE_MEDIA} (see {@link #setAudioAttributes(AudioAttributes)} to
+ * change them).
*/
public Builder() {
}