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

Merge "Convert AudioAttribute to Stream correctly" am: 024387744a am: ce31fe2fb8

Browse Source 
am: 8aac09b0c6

Change-Id: I5e9449c7ce71b7cec57443fe3d994c5c5e87336d
This commit is contained in:
Par-Gunnar Hjalmdahl
2018-09-05 19:18:58 -07:00
committed by android-build-merger
parent c6cff2c927 8aac09b0c6
commit a85a275221
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1035,7 +1035,7 @@ public final class AudioAttributes implements Parcelable {
return fromGetVolumeControlStream ?
AudioSystem.STREAM_SYSTEM : AudioSystem.STREAM_SYSTEM_ENFORCED;
}
if ((aa.getFlags() & FLAG_SCO) == FLAG_SCO) {
if ((aa.getAllFlags() & FLAG_SCO) == FLAG_SCO) {
return fromGetVolumeControlStream ?
AudioSystem.STREAM_VOICE_CALL : AudioSystem.STREAM_BLUETOOTH_SCO;
}