diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-05-28 16:11:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-28 16:11:30 +0000 |
| commit | a0b731363d7fa12a121425fb6845461203d8756f (patch) | |
| tree | 3265fcb43876ab051e7e25297695abc073cd8579 /api | |
| parent | 45d01929291eba56e1bce582192941446b86bf5a (diff) | |
| parent | 1ad0192800f95de71e461651e7e8f6b60a2b05da (diff) | |
| download | frameworks_base-a0b731363d7fa12a121425fb6845461203d8756f.zip frameworks_base-a0b731363d7fa12a121425fb6845461203d8756f.tar.gz frameworks_base-a0b731363d7fa12a121425fb6845461203d8756f.tar.bz2 | |
Merge "DO NOT MERGE temporary hide of AudioAttributes" into lmp-preview-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/api/current.txt b/api/current.txt index cca96e4..96e83f7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13718,45 +13718,6 @@ 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 |