From 1ad0192800f95de71e461651e7e8f6b60a2b05da Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Tue, 27 May 2014 10:46:30 -0700 Subject: [PATCH] DO NOT MERGE temporary hide of AudioAttributes Bug 15089989 Change-Id: I6077d4906d5624be4dd2b8a5c3378a04c848b6d8 --- api/current.txt | 39 --------------------------- media/java/android/media/AudioAttributes.java | 1 + 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/api/current.txt b/api/current.txt index 812dfc4976bd..d139e5d3cbbc 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 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 diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index bb23a363195e..5a3aaabb37f7 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -26,6 +26,7 @@ import java.util.HashSet; import java.util.Set; /** + * @hide * A class to encapsulate a collection of attributes describing information about an audio * player or recorder. */ -- 2.11.0