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

Commit 9da3b8a2 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

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

Change-Id: I836c34e75a08e6645da622afe8b82f23cd82dff5
parents 754abf39 8c06581e

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+1 −2
Original line number Diff line number Diff line
@@ -5218,8 +5218,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",