commit ff8e60316254218c9ed36bff331b979aad32b11f
author Jean-Michel Trivi <jmtrivi@google.com> Thu Feb 02 16:58:02 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 02 16:58:02 2023 +0000
tree 51554ba15b92231c8c7cc4be3612cb0bfc98fbd8
parent ab02c1a03f4ff45f7196d783c3141afa8b61aafc
parent 00afde12c46530cbc98f14166239f1b21cdb2fe1

Merge "Favor dock over speaker combination for SONIFICATION" into tm-qpr-dev

services/audiopolicy/enginedefault/src/Engine.cpp

diff --git a/services/audiopolicy/enginedefault/src/Engine.cpp b/services/audiopolicy/enginedefault/src/Engine.cpp
index 08d6453..8c21534 100644
--- a/services/audiopolicy/enginedefault/src/Engine.cpp
+++ b/services/audiopolicy/enginedefault/src/Engine.cpp
@@ -291,7 +291,9 @@
 
         if ((strategy == STRATEGY_SONIFICATION) ||
                 (getForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM) == AUDIO_POLICY_FORCE_SYSTEM_ENFORCED)) {
-            devices = availableOutputDevices.getDevicesFromType(AUDIO_DEVICE_OUT_SPEAKER);
+            // favor dock over speaker when available
+            devices = availableOutputDevices.getFirstDevicesFromTypes({
+                    AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, AUDIO_DEVICE_OUT_SPEAKER});
         }
 
         // if SCO headset is connected and we are told to use it, play ringtone over