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

am: 6d5ee512f5 Change-Id: I3ff6597d93f7e011f7a1237812958284fc7045c4
5 years ago · 0132854a2c
parent ed83b51264 6d5ee512f5
commit 0132854a2c
1 changed files with 2 additions and 1 deletions
--- a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
@ -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;
        }