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

Commit fe5ce1bd authored by Eric Laurent's avatar Eric Laurent Committed by Gerrit Code Review
Browse files

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

parents 08485d6c c7d4c22a

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -5218,8 +5218,7 @@ status_t AudioPolicyManager::checkOutputsForDevice(const sp<DeviceDescriptor>& d 
            if (!desc->isDuplicated()) {

            if (!desc->isDuplicated()) {

                // exact match on device

                // exact match on device

                if (device_distinguishes_on_address(deviceType) && desc->supportsDevice(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));

                    outputs.add(mOutputs.keyAt(i));

                } else if (!mAvailableOutputDevices.containsAtLeastOne(desc->supportedDevices())) {

                } else if (!mAvailableOutputDevices.containsAtLeastOne(desc->supportedDevices())) {

                    ALOGV("checkOutputsForDevice(): disconnecting adding output %d",

                    ALOGV("checkOutputsForDevice(): disconnecting adding output %d",