commit c33c5cdc24a2b4feea035de80dcd1e06cf4ac371
author Mikhail Naganov <mnaganov@google.com> Sat Oct 14 01:01:56 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Oct 14 01:01:56 2023 +0000
tree b49b625f264685b474a283874eaeccf49b8d1a6d
parent 3a28f3de0b6c304faf62701a85036343ef856863
parent 06dc621b86475f1c21210ffdfa2e2a0ae2cfa3b1

Revert "audio: Use hardcoded r_submix configuration with XML" am: 567d0de485 am: a37a4feed2 am: 3727401bcb am: 06dc621b86

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

Change-Id: I7b3d2fcdb209db82c48799de8472109131057794
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 2f1282a..5d06cb6 100644
--- a/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp
+++ b/audio/aidl/default/AudioPolicyConfigXmlConverter.cpp
@@ -184,15 +184,9 @@
             // 'primary' in the XML schema used by HIDL is equivalent to 'default' module.
             const std::string name =
                     xsdcModule.getName() != "primary" ? xsdcModule.getName() : "default";
-            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);
-            }
+            mModuleConfigurations->emplace_back(
+                    name, VALUE_OR_FATAL(convertModuleConfigToAidl(xsdcModule)));
         }
     }
 }
-
 }  // namespace aidl::android::hardware::audio::core::internal