Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Convert AudioAttribute to Stream correctly for TTS"

Browse Source
This commit is contained in:
Treehugger Robot
2018-09-11 19:26:56 +00:00
committed by Gerrit Code Review
parent 26e686a973 be0103c0a5
commit 874e10f4a6
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/java/android/media/AudioAttributes.java
View File

@@ -715,6 +715,7 @@ public final class AudioAttributes implements Parcelable {
break; break;
case AudioSystem.STREAM_TTS: case AudioSystem.STREAM_TTS:
mContentType = CONTENT_TYPE_SONIFICATION; mContentType = CONTENT_TYPE_SONIFICATION;
mFlags |= FLAG_BEACON;
break; break;
case AudioSystem.STREAM_ACCESSIBILITY: case AudioSystem.STREAM_ACCESSIBILITY:
mContentType = CONTENT_TYPE_SPEECH; mContentType = CONTENT_TYPE_SPEECH;
@@ -1039,6 +1040,10 @@ public final class AudioAttributes implements Parcelable {
return fromGetVolumeControlStream ? return fromGetVolumeControlStream ?
AudioSystem.STREAM_VOICE_CALL : AudioSystem.STREAM_BLUETOOTH_SCO; AudioSystem.STREAM_VOICE_CALL : AudioSystem.STREAM_BLUETOOTH_SCO;
} }
if ((aa.getAllFlags() & FLAG_BEACON) == FLAG_BEACON) {
return fromGetVolumeControlStream ?
AudioSystem.STREAM_MUSIC : AudioSystem.STREAM_TTS;
}
// usage to stream type mapping // usage to stream type mapping
switch (aa.getUsage()) { switch (aa.getUsage()) {