Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa31c07a authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "Revert "AudioPolicyManager: fix closure of output supporting more than... 

Merge "Revert "AudioPolicyManager: fix closure of output supporting more than on device"" am: fe5ce1bd am: 8c06581e am: 9da3b8a2

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1907755

Change-Id: Ic64985cc0324f4b03b30de25e41d89b6069c5bd7
parents 09b4a2aa 9da3b8a2

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+1 −2
Original line number Diff line number Diff line
@@ -5455,8 +5455,7 @@ status_t AudioPolicyManager::checkOutputsForDevice(const sp<DeviceDescriptor>& d 
            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",