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

Commit a85a2752 authored by Par-Gunnar Hjalmdahl's avatar Par-Gunnar Hjalmdahl Committed by android-build-merger
Browse files

Merge "Convert AudioAttribute to Stream correctly" am: 02438774 am: ce31fe2f 

am: 8aac09b0

Change-Id: I5e9449c7ce71b7cec57443fe3d994c5c5e87336d
parents c6cff2c9 8aac09b0

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;

        }