From 9ed0780a8886fa4b26a5d3076e132955f0abf214 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Wed, 6 Jul 2022 14:27:01 +0800
Subject: [PATCH] audio: refactor BAACL

Bug: 236807658
Test: BAACL control test
      audio_waves_custom_actions_test
      audio_adapted_info_device_test
      audio_adapted_info_features_tests
      audio_adapted_info_features_device_tests

Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: I3dbbe745572b8db289db2256c7bf51e23027190e
---
 audio/cheetah/config/audio_platform_configuration.xml | 7 +++++--
 audio/panther/config/audio_platform_configuration.xml | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/audio/cheetah/config/audio_platform_configuration.xml b/audio/cheetah/config/audio_platform_configuration.xml
index 20808d9..165ea71 100644
--- a/audio/cheetah/config/audio_platform_configuration.xml
+++ b/audio/cheetah/config/audio_platform_configuration.xml
@@ -242,7 +242,10 @@
     </dsp_latency>
 
     <soundcard_name name="google,aoc-snd-card" />
-    <features lists="ThermalThrottle=Type:SKIN,Name:VIRTUAL-SKIN" />
+    <features>
+        <feature name="ThermalThrottle=Type:SKIN,Name:VIRTUAL-SKIN"/>
+        <feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn"/>
+    </features>
 
     <cfg_attr>
         <cfg id="OUT_SPEAKER_BE_CFG" intf_name="TDM_RX_0" mux="HW_MUX_GP_0" tuning_id="2"/>
@@ -296,7 +299,7 @@
 
     <external_module>
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
-        <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL"/>
+        <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
         <module libname="audio_cca_aoc.so"/>
         <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
         <module libname="liboffloadeffect.so"/>
diff --git a/audio/panther/config/audio_platform_configuration.xml b/audio/panther/config/audio_platform_configuration.xml
index 20808d9..165ea71 100644
--- a/audio/panther/config/audio_platform_configuration.xml
+++ b/audio/panther/config/audio_platform_configuration.xml
@@ -242,7 +242,10 @@
     </dsp_latency>
 
     <soundcard_name name="google,aoc-snd-card" />
-    <features lists="ThermalThrottle=Type:SKIN,Name:VIRTUAL-SKIN" />
+    <features>
+        <feature name="ThermalThrottle=Type:SKIN,Name:VIRTUAL-SKIN"/>
+        <feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn"/>
+    </features>
 
     <cfg_attr>
         <cfg id="OUT_SPEAKER_BE_CFG" intf_name="TDM_RX_0" mux="HW_MUX_GP_0" tuning_id="2"/>
@@ -296,7 +299,7 @@
 
     <external_module>
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
-        <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL"/>
+        <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
         <module libname="audio_cca_aoc.so"/>
         <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
         <module libname="liboffloadeffect.so"/>