commit 03517c5985804971ce4d961dadc92a24c5de8c85
author Eric Laurent <elaurent@google.com> Thu Apr 11 14:48:16 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 11 14:48:16 2019 +0000
tree a3afa13587e6e9061f479bafc5d2b269c18e52c3
parent 5832f99bbbf7b963322a8c6d2efbf37181ac540c
parent f96e543868c4ba0c24a060d15e20748921593db2

Merge "audiopolicy: fix routing of exclusive preferred device" into qt-dev

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 80393ca..af29f87 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1641,7 +1641,14 @@
     outputDesc->setClientActive(client, true);
 
     if (client->hasPreferredDevice(true)) {
-        devices = getNewOutputDevices(outputDesc, false /*fromCache*/);
+        if (outputDesc->clientsList(true /*activeOnly*/).size() == 1 &&
+                client->isPreferredDeviceForExclusiveUse()) {
+            // Preferred device may be exclusive, use only if no other active clients on this output
+            devices = DeviceVector(
+                        mAvailableOutputDevices.getDeviceFromId(client->preferredDeviceId()));
+        } else {
+            devices = getNewOutputDevices(outputDesc, false /*fromCache*/);
+        }
         if (devices != outputDesc->devices()) {
             checkStrategyRoute(clientStrategy, outputDesc->mIoHandle);
         }