From a0b61b75d39da4b1a24493cfc91588e03b640694 Mon Sep 17 00:00:00 2001 From: Mason Wang Date: Tue, 29 Mar 2022 12:19:06 +0800 Subject: [PATCH 1/3] Add touch module in init.insmod.xxx.cfg for L10. Add touch module into the init.insmod.xxx.cfg, it will be loaded after all common modules in late-init. So the touch module won't be loaded in off-mode-charge. Bug: 227269826 Test: Verify pass that the touch module is not loaded in off-mode-charge. Change-Id: I3448f8e983cb26952d4991c29b5bd66b1120a1fa --- init.insmod.lynx.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/init.insmod.lynx.cfg b/init.insmod.lynx.cfg index 82d59cf..8e5d9ec 100644 --- a/init.insmod.lynx.cfg +++ b/init.insmod.lynx.cfg @@ -7,8 +7,7 @@ # Load device specific kernel modules # Modules here will be loaded *after* all common modules modprobe|snd-soc-cs35l41-spi.ko -modprobe|ftm5.ko -modprobe|sec_touch.ko +modprobe|goodix_brl_touch.ko modprobe|input-cs40l26-i2c.ko # All device specific modules loaded From 66503277b6ced0aabda7199dd6d07b02f751bb9d Mon Sep 17 00:00:00 2001 From: Patty Date: Thu, 10 Feb 2022 15:10:27 +0800 Subject: [PATCH 2/3] Add LE audio policy file Bug: 224661734 Test: Connect with LE audio device and play music Change-Id: I3f2b2d3dd04b492e8ecc800000fe62ac02796674 --- audio/lynx/audio-tables.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/audio/lynx/audio-tables.mk b/audio/lynx/audio-tables.mk index 7185bde..9d3f5ed 100644 --- a/audio/lynx/audio-tables.mk +++ b/audio/lynx/audio-tables.mk @@ -22,7 +22,8 @@ PRODUCT_COPY_FILES += \ device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml + device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ + frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ From 0e73d660996c3e5dbf7ca6c7d0adcd4e37676cdb Mon Sep 17 00:00:00 2001 From: Patty Date: Thu, 10 Feb 2022 15:11:11 +0800 Subject: [PATCH 3/3] Change the makefile include order - The audio-tables.mk is a project specific makefile, the installed file should able to override the common makefile's setting. Bug: 224661734 Test: Make sure the file added in audio-tables.mk can override the common one. Change-Id: I66b223e1e59d61fb6f21fd7f7144b84e4485bcba --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index b02d345..ba8eca7 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -22,8 +22,8 @@ $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-v $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/lynx/device-vendor-lynx.mk) -include device/google/gs201/device-shipping-common.mk 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 $(call soong_config_set,lyric,tuning_product,cloudripper)