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

Commit 74ca430f authored by Vlad Popa's avatar Vlad Popa
Browse files

Remove FLAG_SCO handling from the AudioAttributes 

Now that we removed STREAM_BLUETOOTH_SCO internally within the
AudioService we want to make sure that the AudioAttributes will not be
mapped to AUDIO_STREAM_BLUETOOTH_SCO on the native layers which are not
initialized properly.

Test: manual
Bug: 376756660
Flag: EXEMPT bugfix
Change-Id: I60de6fa9ae7de5619e5735a072732aa5cac44c87
parent ad497393

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 ?