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

Browse Source 
am: ce31fe2fb8

Change-Id: I0901d4076b693d43796fa5552dc0ee5ac383b70e
This commit is contained in:
Par-Gunnar Hjalmdahl
2018-09-05 17:31:28 -07:00
committed by android-build-merger
parent 6d45f85db5 ce31fe2fb8
commit 8aac09b0c6
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;
}