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

Commit 02438774 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Convert AudioAttribute to Stream correctly"

parents ef98a2ca 96e68bc2

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;

        }