commit fe5ce1bdfe2d03ebb79fbcfd5634d9f7d9365ddd
author Eric Laurent <elaurent@google.com> Mon Dec 06 16:06:13 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 06 16:06:13 2021 +0000
tree 5ac92282e64287e950cadcca0ee70a6b9f4e4168
parent 08485d6c888133390779a177835b493f040b93e9
parent c7d4c22a8c0a89f1f11e415008e34a2de3b84c00

Merge "Revert "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 0462727..00ca1f1 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -5218,8 +5218,7 @@
             if (!desc->isDuplicated()) {
                 // exact match on device
                 if (device_distinguishes_on_address(deviceType) && desc->supportsDevice(device)
-                        && desc->containsSingleDeviceSupportingEncodedFormats(device)
-                        && !mAvailableOutputDevices.containsAtLeastOne(desc->supportedDevices())) {
+                        && desc->containsSingleDeviceSupportingEncodedFormats(device)) {
                     outputs.add(mOutputs.keyAt(i));
                 } else if (!mAvailableOutputDevices.containsAtLeastOne(desc->supportedDevices())) {
                     ALOGV("checkOutputsForDevice(): disconnecting adding output %d",