diff options
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/AudioManager.java | 5 | ||||
| -rw-r--r-- | media/java/android/media/AudioSystem.java | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 30f8fbab956b..650c36f26483 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -7388,7 +7388,7 @@ package android.media { field public static final String EXTRA_VOLUME_STREAM_VALUE = "android.media.EXTRA_VOLUME_STREAM_VALUE"; field public static final int FLAG_BLUETOOTH_ABS_VOLUME = 64; // 0x40 field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int STREAM_ASSISTANT = 11; // 0xb - field public static final int STREAM_BLUETOOTH_SCO = 6; // 0x6 + field @Deprecated @FlaggedApi("android.media.audio.deprecate_stream_bt_sco") public static final int STREAM_BLUETOOTH_SCO = 6; // 0x6 field public static final int SUCCESS = 0; // 0x0 } diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index dfe291605522..9beeef4c160f 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -21,6 +21,7 @@ import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_AUDIO; import static android.content.Context.DEVICE_ID_DEFAULT; import static android.media.audio.Flags.autoPublicVolumeApiHardening; import static android.media.audio.Flags.automaticBtDeviceType; +import static android.media.audio.Flags.FLAG_DEPRECATE_STREAM_BT_SCO; import static android.media.audio.Flags.FLAG_FOCUS_EXCLUSIVE_WITH_RECORDING; import static android.media.audio.Flags.FLAG_FOCUS_FREEZE_TEST_API; import static android.media.audio.Flags.FLAG_SUPPORTED_DEVICE_TYPES_API; @@ -406,8 +407,10 @@ public class AudioManager { /** Used to identify the volume of audio streams for notifications */ public static final int STREAM_NOTIFICATION = AudioSystem.STREAM_NOTIFICATION; /** @hide Used to identify the volume of audio streams for phone calls when connected - * to bluetooth */ + * to bluetooth + * @deprecated use {@link #STREAM_VOICE_CALL} instead */ @SystemApi + @FlaggedApi(FLAG_DEPRECATE_STREAM_BT_SCO) public static final int STREAM_BLUETOOTH_SCO = AudioSystem.STREAM_BLUETOOTH_SCO; /** @hide Used to identify the volume of audio streams for enforced system sounds * in certain countries (e.g camera in Japan) */ diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 0ab94f567506..d0d91ba599f9 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -93,7 +93,8 @@ public class AudioSystem /** @hide Used to identify the volume of audio streams for notifications */ public static final int STREAM_NOTIFICATION = 5; /** @hide - * Used to identify the volume of audio streams for phone calls when connected on bluetooth */ + * Used to identify the volume of audio streams for phone calls when connected on bluetooth + * @deprecated use {@link #STREAM_VOICE_CALL} instead */ public static final int STREAM_BLUETOOTH_SCO = 6; /** @hide Used to identify the volume of audio streams for enforced system sounds in certain * countries (e.g camera in Japan) */ @@ -110,7 +111,7 @@ public class AudioSystem public static final int STREAM_ASSISTANT = 11; /** * @hide - * @deprecated Use {@link #numStreamTypes() instead} + * @deprecated Use {@link #numStreamTypes()} instead */ public static final int NUM_STREAMS = 5; |