summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-05-27 10:46:30 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2014-05-27 12:44:05 -0700
commit1ad0192800f95de71e461651e7e8f6b60a2b05da (patch)
treec7b688a814ea1ff35fac3a0a452c552728286047 /api
parentd68200c66b775ae991e9217dd021ef3713f4cc8e (diff)
downloadframeworks_base-1ad0192800f95de71e461651e7e8f6b60a2b05da.zip
frameworks_base-1ad0192800f95de71e461651e7e8f6b60a2b05da.tar.gz
frameworks_base-1ad0192800f95de71e461651e7e8f6b60a2b05da.tar.bz2
DO NOT MERGE temporary hide of AudioAttributes
Bug 15089989 Change-Id: I6077d4906d5624be4dd2b8a5c3378a04c848b6d8
Diffstat (limited to 'api')
-rw-r--r--api/current.txt39
1 files changed, 0 insertions, 39 deletions
diff --git a/api/current.txt b/api/current.txt
index 812dfc4..d139e5d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -13731,45 +13731,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