From 51299b7044b5dcadd3510a2eb3e26d8cb8c8d279 Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Wed, 21 Sep 2022 11:39:40 +0800
Subject: [PATCH 1/4] audio: allow Fortemedia to notify setting to CCA

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

diff --git a/audio/felix/config/audio_platform_configuration.xml b/audio/felix/config/audio_platform_configuration.xml
index 91700dd..88a64f7 100644
--- a/audio/felix/config/audio_platform_configuration.xml
+++ b/audio/felix/config/audio_platform_configuration.xml
@@ -287,7 +287,7 @@
     <external_module>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
-        <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y"/>
+        <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 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 7f413029d1790d10d89e9689c7d053e5fbb8eb6c Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Fri, 16 Sep 2022 16:07:16 +0800
Subject: [PATCH 2/4] audio: update CCA default setting

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

diff --git a/device-felix.mk b/device-felix.mk
index 877d379..303a9e4 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -261,6 +261,10 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.camera.redact_exif=1
 
+##Audio Vendor property
+PRODUCT_PROPERTY_OVERRIDES += \
+	persist.vendor.audio.cca.enabled=true
+
 # Camera
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.camera.extended_launch_boost=1 \

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

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

diff --git a/device-felix.mk b/device-felix.mk
index eb4c3e9..1435809 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -36,6 +36,8 @@ ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),)
 include device/google/felix/uwb/uwb_calibration.mk
 endif
 
+# go/lyric-soong-variables
+$(call soong_config_set,lyric,camera_hardware,felix)
 $(call soong_config_set,lyric,tuning_product,felix)
 $(call soong_config_set,google3a_config,target_device,felix)
 

From 02aba71be0b2a1137dbf4412804a261649049041 Mon Sep 17 00:00:00 2001
From: Taeju Park <taeju@google.com>
Date: Fri, 23 Sep 2022 13:37:25 -0700
Subject: [PATCH 4/4] Add Ownership to powerhint files

Bug: 248115959
Signed-off-by: Taeju Park <taeju@google.com>
Change-Id: I292e7dab52262d114897d508c083219202506b4e
---
 OWNERS | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 OWNERS

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..1451bd8
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1 @@
+per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com