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

Commit 8396187d authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "Audio policy: fix HwModuleCollection::getDeviceDescriptor" into qt-r1-dev am: 6d5ee512 

am: 0132854a

Change-Id: I5119723f27364cef4cbe6f2a7b2c3a8aad87e2ba
parents 47184212 0132854a

services/audiopolicy/common/managerdefinitions/src/HwModule.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -333,9 +333,10 @@ sp<DeviceDescriptor> HwModuleCollection::getDeviceDescriptor(const audio_devices 
            if (encodedFormat != AUDIO_FORMAT_DEFAULT) {

            if (encodedFormat != AUDIO_FORMAT_DEFAULT) {

                moduleDevice->setEncodedFormat(encodedFormat);

                moduleDevice->setEncodedFormat(encodedFormat);

            }

            }

            moduleDevice->setAddress(devAddress);

            if (allowToCreate) {

            if (allowToCreate) {

                moduleDevice->attach(hwModule);

                moduleDevice->attach(hwModule);

                moduleDevice->setAddress(devAddress);

                moduleDevice->setName(String8(name));

            }

            }

            return moduleDevice;

            return moduleDevice;

        }

        }