commit 839cd0691bd3265343e87fbb9545ed27319b99c1
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 27 22:24:34 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 27 22:24:34 2019 +0000
tree 318447c31b0b21907335d95e8bef2ec9470eac3d
parent 5158f491c60074b061b00d7018b6b889d664112e
parent a81b20a80ae556a4b93199c617a8fe467a4a6a3a

Merge "Audio policy: fix HwModuleCollection::getDeviceDescriptor"

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

diff --git a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
index 96a8337..1f9b725 100644
--- a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
@@ -333,9 +333,10 @@
             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;
         }