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

Commit 42431438 authored by Eric Laurent's avatar Eric Laurent
Browse files

DO NOT MERGE - audio policy: fix DeviceVector::getDevicesFromType() 

Fix device type comparison in DeviceVector::getDevicesFromType():
AUDIO_DEVICE_BIT_IN bit must be excluded from type comparison
and used as an orthogonal match criterium.

Manual cherry-pick from master 4c91f90c

Bug: 19957479

Change-Id: Ica9f440384bcb85e669864bd29504a4fda862ce7
parent c42c4b52

services/audiopolicy/AudioPolicyManager.cpp

+6 −2
Original line number Diff line number Diff line
@@ -7635,10 +7635,14 @@ AudioPolicyManager::DeviceVector AudioPolicyManager::DeviceVector::getDevicesFro 
                                                                        audio_devices_t type) const

{

    DeviceVector devices;

    bool isOutput = audio_is_output_devices(type);

    type &= ~AUDIO_DEVICE_BIT_IN;

    for (size_t i = 0; (i < size()) && (type != AUDIO_DEVICE_NONE); i++) {

        if (itemAt(i)->mDeviceType & type & ~AUDIO_DEVICE_BIT_IN) {

        bool curIsOutput = audio_is_output_devices(itemAt(i)->mDeviceType);

        audio_devices_t curType = itemAt(i)->mDeviceType & ~AUDIO_DEVICE_BIT_IN;

        if ((isOutput == curIsOutput) && ((type & curType) != 0)) {

            devices.add(itemAt(i));

            type &= ~itemAt(i)->mDeviceType;

            type &= ~curType;

            ALOGV("DeviceVector::getDevicesFromType() for type %x found %p",

                  itemAt(i)->mDeviceType, itemAt(i).get());

        }