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

Commit 41d3c94b authored by Vlad Popa's avatar Vlad Popa Committed by Android (Google) Code Review
Browse files

Merge "Remove FLAG_SCO handling from the AudioAttributes" into main

parents 437766ac 74ca430f

media/java/android/media/AudioAttributes.java

+1 −3
Original line number Diff line number Diff line
@@ -1202,7 +1202,6 @@ public final class AudioAttributes implements Parcelable { 
                    break;

                case AudioSystem.STREAM_BLUETOOTH_SCO:

                    mContentType = CONTENT_TYPE_SPEECH;

                    mFlags |= FLAG_SCO;

                    break;

                case AudioSystem.STREAM_DTMF:

                    mContentType = CONTENT_TYPE_SONIFICATION;
@@ -1750,8 +1749,7 @@ public final class AudioAttributes implements Parcelable { 
                    AudioSystem.STREAM_SYSTEM : AudioSystem.STREAM_SYSTEM_ENFORCED;

        }

        if ((aa.getAllFlags() & FLAG_SCO) == FLAG_SCO) {

            return fromGetVolumeControlStream ?

                    AudioSystem.STREAM_VOICE_CALL : AudioSystem.STREAM_BLUETOOTH_SCO;

            return AudioSystem.STREAM_VOICE_CALL;

        }

        if ((aa.getAllFlags() & FLAG_BEACON) == FLAG_BEACON) {

            return fromGetVolumeControlStream ?