From a35e60d4f8a7cdd2ddefafc61ae190a17896776c Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Fri, 14 Apr 2023 09:32:57 +0800
Subject: [PATCH 1/2] audio: enable CCA for VoIP downlink

Bug: 278151806
Test: build pass
Change-Id: Ia5bf8ae2b316c61452c4ba0891fdff61b26cf251
Signed-off-by: Carter Hsu <carterhsu@google.com>
---
 audio/husky/config/audio_platform_configuration.xml | 2 +-
 audio/shiba/config/audio_platform_configuration.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml
index ae4b6aa..244ab21 100644
--- a/audio/husky/config/audio_platform_configuration.xml
+++ b/audio/husky/config/audio_platform_configuration.xml
@@ -305,7 +305,7 @@
     <external_module>
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN"/>
-        <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000"/>
+        <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
         <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml
index ae4b6aa..244ab21 100644
--- a/audio/shiba/config/audio_platform_configuration.xml
+++ b/audio/shiba/config/audio_platform_configuration.xml
@@ -305,7 +305,7 @@
     <external_module>
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN"/>
-        <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000"/>
+        <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
         <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>

From 2d15151a87b8ded6de955079736f351251828fa0 Mon Sep 17 00:00:00 2001
From: Cheng Chang <chengcha@google.com>
Date: Tue, 28 Mar 2023 05:14:18 +0000
Subject: [PATCH 2/2] gps: add malloc assertion condition

Bug: 271750700
Bug: 274541210
Test: verify at b/274541210
Change-Id: I2465edb0534c2419bdfeab31d70404343e35b290
---
 location/gps.xml     | 1 +
 location/gps.xml.hk3 | 1 +
 location/gps.xml.sb3 | 1 +
 3 files changed, 3 insertions(+)

diff --git a/location/gps.xml b/location/gps.xml
index 8955883..110ffe0 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -61,6 +61,7 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       MallocDebugAssertThreshold="104857600"
   />
 
   <gll
diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3
index e2404a3..a111c9c 100644
--- a/location/gps.xml.hk3
+++ b/location/gps.xml.hk3
@@ -61,6 +61,7 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       MallocDebugAssertThreshold="104857600"
   />
 
   <gll
diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3
index a2c9baf..69bba8a 100644
--- a/location/gps.xml.sb3
+++ b/location/gps.xml.sb3
@@ -61,6 +61,7 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       MallocDebugAssertThreshold="104857600"
   />
 
   <gll