commit b1b4ddf70cc166d6197d6ff7f9b46eb174e033e2
author Eric Laurent <elaurent@google.com> Thu Oct 21 12:42:46 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 21 12:42:46 2021 +0000
tree 983a46a17ef858823cb2203e4ae342c54fbfa40e
parent 479eea2bd7b027d4ff00496f1be7d8d16bb84884
parent d7a5f2de9dd87eb1c4558331e838ee58432b8af2

Merge "AudioPolicyManager: fix closure of output supporting more than on device"

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index cc2d8e8..6e943d8 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -5219,7 +5219,8 @@
             if (!desc->isDuplicated()) {
                 // exact match on device
                 if (device_distinguishes_on_address(deviceType) && desc->supportsDevice(device)
-                        && desc->containsSingleDeviceSupportingEncodedFormats(device)) {
+                        && desc->containsSingleDeviceSupportingEncodedFormats(device)
+                        && !mAvailableOutputDevices.containsAtLeastOne(desc->supportedDevices())) {
                     outputs.add(mOutputs.keyAt(i));
                 } else if (!mAvailableOutputDevices.containsAtLeastOne(desc->supportedDevices())) {
                     ALOGV("checkOutputsForDevice(): disconnecting adding output %d",