summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-08-01 17:55:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-01 02:00:00 +0000
commit9aa499ac42e8e047c9341715599b1ffba4c6f827 (patch)
tree95468570b79f3fd7b50e45a5a14522affe99ac88 /api
parentcc58c76cf038343020331060d19ae39308f2a5cf (diff)
parent0498269c00e340a5cacf19c00d552c9a311cc604 (diff)
downloadframeworks_base-9aa499ac42e8e047c9341715599b1ffba4c6f827.zip
frameworks_base-9aa499ac42e8e047c9341715599b1ffba4c6f827.tar.gz
frameworks_base-9aa499ac42e8e047c9341715599b1ffba4c6f827.tar.bz2
Merge "unhide AudioFormat getters" into lmp-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 3e03e08..6e89e8b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14108,6 +14108,9 @@ package android.media {
}
public class AudioFormat {
+ method public int getChannelMask();
+ method public int getEncoding();
+ method public int getSampleRate();
field public static final deprecated int CHANNEL_CONFIGURATION_DEFAULT = 1; // 0x1
field public static final deprecated int CHANNEL_CONFIGURATION_INVALID = 0; // 0x0
field public static final deprecated int CHANNEL_CONFIGURATION_MONO = 2; // 0x2