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

Commit 96df02b1 authored by Jacqueline Bronger's avatar Jacqueline Bronger
Browse files

Add (e)ARC cases to AudioAttributesUtils 

Not having these cases causes the (e)ARC device to not be selected
properly in the SystemMediaroute2Provider when switching back to this
route.

Bug: 304370989
Test: Switch from ARC to Bluetooth to ARC in media output dialog - sound
should be heard via the ARC device.

Change-Id: I60a44df100a4bf735b6198447471b330dd867779
parent cd28fd71

services/core/java/com/android/server/media/AudioAttributesUtils.java

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ import android.media.MediaRoute2Info; 
            case AudioDeviceInfo.TYPE_DOCK_ANALOG:

                return MediaRoute2Info.TYPE_DOCK;

            case AudioDeviceInfo.TYPE_HDMI:

            case AudioDeviceInfo.TYPE_HDMI_ARC:

            case AudioDeviceInfo.TYPE_HDMI_EARC:

                return MediaRoute2Info.TYPE_HDMI;

            case AudioDeviceInfo.TYPE_USB_DEVICE:

                return MediaRoute2Info.TYPE_USB_DEVICE;
@@ -81,6 +83,8 @@ import android.media.MediaRoute2Info; 
            case AudioDeviceInfo.TYPE_DOCK:

            case AudioDeviceInfo.TYPE_DOCK_ANALOG:

            case AudioDeviceInfo.TYPE_HDMI:

            case AudioDeviceInfo.TYPE_HDMI_ARC:

            case AudioDeviceInfo.TYPE_HDMI_EARC:

            case AudioDeviceInfo.TYPE_USB_DEVICE:

                return true;

            default: