commit 454a2cc1c8d8794ae91c965f2858183ed806440d
author Eric Laurent <elaurent@google.com> Wed Jan 26 11:56:13 2022 +0100
committer Eric Laurent <elaurent@google.com> Wed Jan 26 11:44:58 2022 +0000
tree 7db4abbdf88d8e528bb575f478475123c2dc1885
parent 15e4e3550f02b6658c2b9ebc400337aede510f05

Revert "Revert "audio policy: implement routing policy for USB docking s...""

This reverts commit 73b6c9635f86ef64cd6c74d82327c12b0255f80f.

Bug: 197584191
Test: make
Change-Id: Id587c2a554a32a138be7a388460554f1664bcffa

services/audiopolicy/enginedefault/src/Engine.cpp

diff --git a/services/audiopolicy/enginedefault/src/Engine.cpp b/services/audiopolicy/enginedefault/src/Engine.cpp
index 4c3d92c..dc34a38 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) {