diff options
| author | 2024-11-01 00:31:26 +0000 | |
|---|---|---|
| committer | 2024-11-01 00:31:26 +0000 | |
| commit | 41d3c94b4702d9c4e89b47e32d90acda8d887c68 (patch) | |
| tree | 111d3ed42a7e5114fe2224dcd35d70eec4557e90 | |
| parent | 437766ac3b07af94b8478c4867db2865aef24f25 (diff) | |
| parent | 74ca430f6f1e47611c4e927aa95e6512eddf764d (diff) | |
Merge "Remove FLAG_SCO handling from the AudioAttributes" into main
| -rw-r--r-- | media/java/android/media/AudioAttributes.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index 1024a5519965..1db719828c76 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -1202,7 +1202,6 @@ public final class AudioAttributes implements Parcelable { break; case AudioSystem.STREAM_BLUETOOTH_SCO: mContentType = CONTENT_TYPE_SPEECH; - mFlags |= FLAG_SCO; break; case AudioSystem.STREAM_DTMF: mContentType = CONTENT_TYPE_SONIFICATION; @@ -1750,8 +1749,7 @@ public final class AudioAttributes implements Parcelable { AudioSystem.STREAM_SYSTEM : AudioSystem.STREAM_SYSTEM_ENFORCED; } if ((aa.getAllFlags() & FLAG_SCO) == FLAG_SCO) { - return fromGetVolumeControlStream ? - AudioSystem.STREAM_VOICE_CALL : AudioSystem.STREAM_BLUETOOTH_SCO; + return AudioSystem.STREAM_VOICE_CALL; } if ((aa.getAllFlags() & FLAG_BEACON) == FLAG_BEACON) { return fromGetVolumeControlStream ? |