diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/AudioAttributes.java | 16 |
4 files changed, 17 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index a816d435d083..ec16f5a5f56b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -19948,6 +19948,7 @@ package android.media { 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_ASSISTANT = 16; // 0x10 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 diff --git a/api/system-current.txt b/api/system-current.txt index 61c22375addc..4bba111f9392 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -21442,6 +21442,7 @@ package android.media { 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_ASSISTANT = 16; // 0x10 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 diff --git a/api/test-current.txt b/api/test-current.txt index b5a91e9a45fa..d4fb027bcb4d 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -20035,6 +20035,7 @@ package android.media { 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_ASSISTANT = 16; // 0x10 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 diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index 5440f0fc214f..dc8264a81427 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -169,6 +169,11 @@ public final class AudioAttributes implements Parcelable { * source, such as audio capture devices. */ public final static int USAGE_VIRTUAL_SOURCE = 15; + /** + * Usage value to use for audio responses to user queries, audio instructions or help + * utterances. + */ + public final static int USAGE_ASSISTANT = 16; /** * IMPORTANT: when adding new usage types, add them to SDK_USAGES and update SUPPRESSIBLE_USAGES @@ -227,7 +232,8 @@ public final class AudioAttributes implements Parcelable { USAGE_ASSISTANCE_ACCESSIBILITY, USAGE_ASSISTANCE_NAVIGATION_GUIDANCE, USAGE_ASSISTANCE_SONIFICATION, - USAGE_GAME + USAGE_GAME, + USAGE_ASSISTANT, }; /** @@ -473,6 +479,7 @@ public final class AudioAttributes implements Parcelable { * {@link AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_INSTANT}, * {@link AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_DELAYED}, * {@link AudioAttributes#USAGE_NOTIFICATION_EVENT}, + * {@link AudioAttributes#USAGE_ASSISTANT}, * {@link AudioAttributes#USAGE_ASSISTANCE_ACCESSIBILITY}, * {@link AudioAttributes#USAGE_ASSISTANCE_NAVIGATION_GUIDANCE}, * {@link AudioAttributes#USAGE_ASSISTANCE_SONIFICATION}, @@ -497,6 +504,7 @@ public final class AudioAttributes implements Parcelable { case USAGE_ASSISTANCE_SONIFICATION: case USAGE_GAME: case USAGE_VIRTUAL_SOURCE: + case USAGE_ASSISTANT: mUsage = usage; break; default: @@ -844,6 +852,8 @@ public final class AudioAttributes implements Parcelable { return new String("USAGE_ASSISTANCE_SONIFICATION"); case USAGE_GAME: return new String("USAGE_GAME"); + case USAGE_ASSISTANT: + return new String("USAGE_ASSISTANT"); default: return new String("unknown usage " + usage); } @@ -923,6 +933,7 @@ public final class AudioAttributes implements Parcelable { case USAGE_MEDIA: case USAGE_GAME: case USAGE_ASSISTANCE_NAVIGATION_GUIDANCE: + case USAGE_ASSISTANT: return AudioSystem.STREAM_MUSIC; case USAGE_ASSISTANCE_SONIFICATION: return AudioSystem.STREAM_SYSTEM; @@ -972,7 +983,8 @@ public final class AudioAttributes implements Parcelable { USAGE_ASSISTANCE_ACCESSIBILITY, USAGE_ASSISTANCE_NAVIGATION_GUIDANCE, USAGE_ASSISTANCE_SONIFICATION, - USAGE_GAME + USAGE_GAME, + USAGE_ASSISTANT, }) @Retention(RetentionPolicy.SOURCE) public @interface AttributeUsage {} |