diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-05-12 17:55:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-12 17:55:09 +0000 |
| commit | 33bbf3f323124d46d997459a3d31b3bc4b47d79a (patch) | |
| tree | e90980b0f1847d5b2c2cbc10f4cbccbfb86f9c1e /api | |
| parent | 703a70ebd3d701fd3e7248ae8b7031746f6bf111 (diff) | |
| parent | bdad5cb12437fdcb04c26430a55e7adae2d3e937 (diff) | |
| download | frameworks_base-33bbf3f323124d46d997459a3d31b3bc4b47d79a.zip frameworks_base-33bbf3f323124d46d997459a3d31b3bc4b47d79a.tar.gz frameworks_base-33bbf3f323124d46d997459a3d31b3bc4b47d79a.tar.bz2 | |
am d4accb98: Merge "Define audio attributes"
* commit 'd4accb989aa92ca16a7806db9bad2425ac81028f':
Define audio attributes
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ce0744d..1e2c005 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13340,6 +13340,45 @@ package android.media { method public void stop(); } + public final class AudioAttributes { + method public int getContentType(); + method public int getFlags(); + method public java.util.Set<java.lang.String> getTags(); + method public int getUsage(); + field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3 + field public static final int CONTENT_TYPE_MUSIC = 2; // 0x2 + field public static final int CONTENT_TYPE_SONIFICATION = 4; // 0x4 + field public static final int CONTENT_TYPE_SPEECH = 1; // 0x1 + field public static final int CONTENT_TYPE_UNKNOWN = 0; // 0x0 + field public static final int FLAG_AUDIBILITY_ENFORCED = 1; // 0x1 + field public static final int USAGE_ALARM = 4; // 0x4 + field public static final int USAGE_ASSISTANCE_ACCESSIBILITY = 11; // 0xb + field public static final int USAGE_ASSISTANCE_NAVIGATION_GUIDANCE = 12; // 0xc + field public static final int USAGE_ASSISTANCE_SONIFICATION = 13; // 0xd + field public static final int USAGE_GAME = 14; // 0xe + field public static final int USAGE_MEDIA = 1; // 0x1 + field public static final int USAGE_NOTIFICATION = 5; // 0x5 + field public static final int USAGE_NOTIFICATION_COMMUNICATION_DELAYED = 9; // 0x9 + field public static final int USAGE_NOTIFICATION_COMMUNICATION_INSTANT = 8; // 0x8 + field public static final int USAGE_NOTIFICATION_COMMUNICATION_REQUEST = 7; // 0x7 + field public static final int USAGE_NOTIFICATION_EVENT = 10; // 0xa + field public static final int USAGE_NOTIFICATION_TELEPHONY_RINGTONE = 6; // 0x6 + field public static final int USAGE_UNKNOWN = 0; // 0x0 + field public static final int USAGE_VOICE_COMMUNICATION = 2; // 0x2 + field public static final int USAGE_VOICE_COMMUNICATION_SIGNALLING = 3; // 0x3 + } + + public static class AudioAttributes.Builder { + ctor public AudioAttributes.Builder(); + ctor public AudioAttributes.Builder(android.media.AudioAttributes); + method public android.media.AudioAttributes.Builder addTag(java.lang.String); + method public android.media.AudioAttributes build(); + method public android.media.AudioAttributes.Builder setContentType(int); + method public android.media.AudioAttributes.Builder setFlags(int); + method public android.media.AudioAttributes.Builder setLegacyStreamType(int); + method public android.media.AudioAttributes.Builder setUsage(int); + } + public class AudioFormat { ctor public AudioFormat(); field public static final deprecated int CHANNEL_CONFIGURATION_DEFAULT = 1; // 0x1 |