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

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

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

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

Change-Id: I3d8f8e5f96cbc22334ae082852884ff7ba427c94
parents 11627517 b1b4ddf7

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -5219,7 +5219,8 @@ 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)) {

                        && desc->containsSingleDeviceSupportingEncodedFormats(device)

                        && !mAvailableOutputDevices.containsAtLeastOne(desc->supportedDevices())) {

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

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

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