Merge "Audio policy: fix HwModuleCollection::getDeviceDescriptor"

5 years ago · 839cd0691b
parent 5158f491c6 a81b20a80a
commit 839cd0691b
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;
        }