Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96e68bc2 authored by Par-Gunnar Hjalmdahl's avatar Par-Gunnar Hjalmdahl Committed by Tomoharu Kasahara
Browse files

Convert AudioAttribute to Stream correctly 

When converting an AudioAttribute with FLAG_SCO set, it should
be converted to STREAM_BLUETOOTH_SCO. However, since getFlags()
returns only public flags, and FLAG_SCO isn't public,
the conversion will fail. Change to getAllFlags() to get right
flags.

Bug: 113314374
Test: Use AudioAttributes.toLegacyStreamType

Change-Id: Ic283f055d746d5c3df645dc310c92dac3c80827f
parent 473654c3

media/java/android/media/AudioAttributes.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }