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

Commit 0132854a 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

Change-Id: I3ff6597d93f7e011f7a1237812958284fc7045c4
parents ed83b512 6d5ee512

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

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

                moduleDevice->setEncodedFormat(encodedFormat);

            }

            moduleDevice->setAddress(devAddress);

            if (allowToCreate) {

                moduleDevice->attach(hwModule);

                moduleDevice->setAddress(devAddress);

                moduleDevice->setName(String8(name));

            }

            return moduleDevice;

        }