summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorPaul Mclean <pmclean@google.com>2015-08-05 20:50:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-05 20:50:29 +0000
commit8eaf18b0ab77184f16870428258650bd12bb2ea5 (patch)
treea91f4ed8ad9545869f9587a72853c0e6a769a838 /media/java
parent881cd15519535e493d497fefd857f8fe0236c774 (diff)
parent22cfec3cb843ede7d969591813d6a68eada930ce (diff)
downloadframeworks_base-8eaf18b0ab77184f16870428258650bd12bb2ea5.zip
frameworks_base-8eaf18b0ab77184f16870428258650bd12bb2ea5.tar.gz
frameworks_base-8eaf18b0ab77184f16870428258650bd12bb2ea5.tar.bz2
Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/AudioDeviceInfo.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/media/java/android/media/AudioDeviceInfo.java b/media/java/android/media/AudioDeviceInfo.java
index bdb1f58..6104264 100644
--- a/media/java/android/media/AudioDeviceInfo.java
+++ b/media/java/android/media/AudioDeviceInfo.java
@@ -156,6 +156,8 @@ public final class AudioDeviceInfo {
/**
* @return An array of sample rates supported by the audio device.
+ *
+ * Note: an empty array indicates that the device supports arbitrary rates.
*/
public @NonNull int[] getSampleRates() {
return mPort.samplingRates();
@@ -166,6 +168,8 @@ public final class AudioDeviceInfo {
* {@link AudioFormat#CHANNEL_OUT_7POINT1}) for which this audio device can be configured.
*
* @see AudioFormat
+ *
+ * Note: an empty array indicates that the device supports arbitrary channel masks.
*/
public @NonNull int[] getChannelMasks() {
return mPort.channelMasks();
@@ -175,6 +179,8 @@ public final class AudioDeviceInfo {
* @return An array of channel index masks for which this audio device can be configured.
*
* @see AudioFormat
+ *
+ * Note: an empty array indicates that the device supports arbitrary channel index masks.
*/
public @NonNull int[] getChannelIndexMasks() {
return mPort.channelIndexMasks();
@@ -183,6 +189,8 @@ public final class AudioDeviceInfo {
/**
* @return An array of channel counts (1, 2, 4, ...) for which this audio device
* can be configured.
+ *
+ * Note: an empty array indicates that the device supports arbitrary channel counts.
*/
public @NonNull int[] getChannelCounts() {
int[] masks = getChannelMasks();
@@ -205,6 +213,8 @@ public final class AudioDeviceInfo {
* integer precision to that device.
*
* @see AudioFormat
+ *
+ * Note: an empty array indicates that the device supports arbitrary encodings.
*/
public @NonNull int[] getEncodings() {
return AudioFormat.filterPublicFormats(mPort.formats());