commit 2d12771681be683e6ff8fca80641f6a92882f1f3
author Eric Laurent <elaurent@google.com> Fri Jan 21 23:07:07 2022 +0100
committer Eric Laurent <elaurent@google.com> Fri Jan 21 23:07:07 2022 +0100
tree 3e1157334ea075318c0c535180df43fcffc53c5a
parent 0783619c1fe1f6edbecb8afea8cb6bbedc8510c6

audio policy: implement routing policy for USB docking stations

USB docking stations with speaker use device type
AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET.

A docking station is not treated as a regular USB headset in that it
does not follows the same rules as wireless or wired headsets which
requires that media is routed to the most recently connected device.

Bug: 197584191
Test: make
Change-Id: I461661dd42190f513632d1df3a1583f9d82efc1e

services/audiopolicy/enginedefault/src/Engine.cpp

diff --git a/services/audiopolicy/enginedefault/src/Engine.cpp b/services/audiopolicy/enginedefault/src/Engine.cpp
index c73c17d..96e6685 100644
--- a/services/audiopolicy/enginedefault/src/Engine.cpp
+++ b/services/audiopolicy/enginedefault/src/Engine.cpp
@@ -272,7 +272,8 @@
         devices = availableOutputDevices.getFirstDevicesFromTypes(
                                           getLastRemovableMediaDevices());
         if (!devices.isEmpty()) break;
-        devices = availableOutputDevices.getDevicesFromType(AUDIO_DEVICE_OUT_EARPIECE);
+        devices = availableOutputDevices.getFirstDevicesFromTypes({
+                AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, AUDIO_DEVICE_OUT_EARPIECE});
     } break;
 
     case STRATEGY_SONIFICATION:
@@ -364,7 +365,8 @@
                     AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET);
         }
         if (devices2.isEmpty()) {
-            devices2 = availableOutputDevices.getDevicesFromType(AUDIO_DEVICE_OUT_SPEAKER);
+            devices2 = availableOutputDevices.getFirstDevicesFromTypes({
+                        AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, AUDIO_DEVICE_OUT_SPEAKER});
         }
         DeviceVector devices3;
         if (strategy == STRATEGY_MEDIA) {