commit 660c8f7a8d99da0a88df42425819abf99ce067cc
author Mikhail Naganov <mnaganov@google.com> Wed Oct 18 19:16:45 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 18 19:16:45 2023 +0000
tree 8d83a3b6284a6392a117177b88f3dcbad99edc7f
parent 9bee81e56b80f1a586baba00081e3f09bbec00fb
parent 9d6f832b8e707330a6a20f05c0ad5749270317a1

audio: Use hardcoded r_submix configuration with XML am: fc35ca3d32 am: 067d106779 am: 9d6f832b8e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794109

Change-Id: I51a84be684a0a450947b28fdd9ebed2a74b31ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

audio/aidl/default/AudioPolicyConfigXmlConverter.cpp

diff --git a/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp b/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp
index 5d06cb6..2f1282a 100644
--- a/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp
+++ b/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp
@@ -184,9 +184,15 @@
             // 'primary' in the XML schema used by HIDL is equivalent to 'default' module.
             const std::string name =
                     xsdcModule.getName() != "primary" ? xsdcModule.getName() : "default";
-            mModuleConfigurations->emplace_back(
-                    name, VALUE_OR_FATAL(convertModuleConfigToAidl(xsdcModule)));
+            if (name != "r_submix") {
+                mModuleConfigurations->emplace_back(
+                        name, VALUE_OR_FATAL(convertModuleConfigToAidl(xsdcModule)));
+            } else {
+                // See the note on the 'getRSubmixConfiguration' function.
+                mModuleConfigurations->emplace_back(name, nullptr);
+            }
         }
     }
 }
+
 }  // namespace aidl::android::hardware::audio::core::internal