From 32f4c7a96b9e5a79ad32566c0c26bcdcc7246bec Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Fri, 16 Sep 2022 16:02:01 +0800
Subject: [PATCH 1/3] audio: update CCA default setting

Bug: 248151108
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: If8e5b6be12a56db7177f3f784a0dcb1f8957e684
---
 device-lynx.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device-lynx.mk b/device-lynx.mk
index 9fa0141..89c3570 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -243,6 +243,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     debug.sf.enable_adpf_cpu_hint=true
 
+##Audio Vendor property
+PRODUCT_PROPERTY_OVERRIDES += \
+	persist.vendor.audio.cca.enabled=true
+
 # userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     PRODUCT_COPY_FILES += \

From 8e8d9e5c7af977e72d30fcd9c297737b75fb7294 Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Wed, 21 Sep 2022 11:40:14 +0800
Subject: [PATCH 2/3] audio: allow Fortemedia to notify setting to CCA

Bug: 237720492
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I9946644bbf213dc9dc7226cc684923ac7eb53351
---
 audio/lynx/config/audio_platform_configuration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/audio/lynx/config/audio_platform_configuration.xml b/audio/lynx/config/audio_platform_configuration.xml
index 26f75f7..8e24187 100644
--- a/audio/lynx/config/audio_platform_configuration.xml
+++ b/audio/lynx/config/audio_platform_configuration.xml
@@ -290,7 +290,7 @@
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
         <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:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y"/>
+        <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y SHARED_MODULE=1130578253"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>

From fc3b4c71994217722b084d6a2166f38ab26127f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= <krzysio@google.com>
Date: Tue, 13 Sep 2022 01:59:02 +0000
Subject: [PATCH 3/3] Set Lyric camera_hardware variable.

Bug: 240478511
Test: presubmit
Change-Id: I79a6c65e73a5813e3e10749564a1e8dae50c45a0
Merged-In: I79a6c65e73a5813e3e10749564a1e8dae50c45a0
---
 device-lynx.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/device-lynx.mk b/device-lynx.mk
index 89c3570..be796f7 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -29,6 +29,8 @@ include device/google/lynx/audio/lynx/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 
+# go/lyric-soong-variables
+$(call soong_config_set,lyric,camera_hardware,lynx)
 $(call soong_config_set,lyric,tuning_product,lynx)
 $(call soong_config_set,google3a_config,target_device,lynx)