commit bc585bd9869039885cc435f96fdbfefd6dce39c3
author Lorena Torres-Huerta <lorenatorres@google.com> Sun Oct 23 20:41:35 2022 +0000
committer Lorena Torres-Huerta <lorenatorres@google.com> Thu Dec 08 03:47:24 2022 +0000
tree 5b5aa68273f3ca41e53ace6f88deb69c9b4bae7c
parent db11b2db44c36900692e49aaeebd93fd647633e4

Default implementation for IConfig engine configuration.

Added XML to AIDL conversion classes that support
audio_policy_engine_configuration and audio_policy_configuration
schemas.

CTS-Coverage-Bug: 261509055
Bug: 242678729
Test: atest VtsHalAudioCoreTargetTest
Change-Id: If47932093af45c5289d070d4893cd10e79593e31

audio/aidl/default/Config.cpp

diff --git a/audio/aidl/default/Config.cpp b/audio/aidl/default/Config.cpp
index 7aa4afe..87c0ace 100644
--- a/audio/aidl/default/Config.cpp
+++ b/audio/aidl/default/Config.cpp
@@ -14,10 +14,14 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "AHAL_Module"
+#define LOG_TAG "AHAL_Config"
 #include <android-base/logging.h>
 
+#include <system/audio_config.h>
+
+#include "core-impl/AudioPolicyConfigXmlConverter.h"
 #include "core-impl/Config.h"
+#include "core-impl/EngineConfigXmlConverter.h"
 
 using aidl::android::media::audio::common::AudioHalEngineConfig;
 
@@ -31,9 +35,21 @@
 }
 
 ndk::ScopedAStatus Config::getEngineConfig(AudioHalEngineConfig* _aidl_return) {
-    AudioHalEngineConfig engineConfig;
-    // TODO: parse from XML; for now, use empty config as default
-    *_aidl_return = std::move(engineConfig);
+    static const AudioHalEngineConfig returnEngCfg = [this]() {
+        AudioHalEngineConfig engConfig;
+        if (mEngConfigConverter.getStatus() == ::android::OK) {
+            engConfig = mEngConfigConverter.getAidlEngineConfig();
+        } else {
+            LOG(INFO) << __func__ << mEngConfigConverter.getError();
+            if (mAudioPolicyConverter.getStatus() == ::android::OK) {
+                engConfig = mAudioPolicyConverter.getAidlEngineConfig();
+            } else {
+                LOG(WARNING) << __func__ << mAudioPolicyConverter.getError();
+            }
+        }
+        return engConfig;
+    }();
+    *_aidl_return = returnEngCfg;
     LOG(DEBUG) << __func__ << ": returning " << _aidl_return->toString();
     return ndk::ScopedAStatus::ok();
 }