From cd63701eb0ee43fbd3d08b247f8fa784dcdeea71 Mon Sep 17 00:00:00 2001 From: Jakub Tyszkowski Date: Thu, 14 Jul 2022 11:36:56 +0000 Subject: [PATCH 1/3] audio: Enable Le Audio SW LC3 coding Since the Le Audio HW offloader enable/disable control flag controls Unicast and Broadcast at the same time, we need them both to work either with HW or SW audio coding paths. This patch enables software encoding audio path on unicast. This is the only way to make unicast and broadcast to interact, since the HW offloader for Braodcast is not yet ready. Bug: 238997591 Fixes: 238997591 Tag: #feature Test: atest BluetoothInstrumentationTests Change-Id: I04fc1306eb15ea2ae102f65b59c1b1cca2070dd1 --- audio/lynx/audio-tables.mk | 1 + ...licy_configuration_le_offload_disabled.xml | 260 ++++++++++++++++++ 2 files changed, 261 insertions(+) create mode 100644 audio/lynx/config/audio_policy_configuration_le_offload_disabled.xml diff --git a/audio/lynx/audio-tables.mk b/audio/lynx/audio-tables.mk index f38db39..812dbce 100644 --- a/audio/lynx/audio-tables.mk +++ b/audio/lynx/audio-tables.mk @@ -24,6 +24,7 @@ PRODUCT_COPY_FILES += \ 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/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.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 diff --git a/audio/lynx/config/audio_policy_configuration_le_offload_disabled.xml b/audio/lynx/config/audio_policy_configuration_le_offload_disabled.xml new file mode 100644 index 0000000..224d0a2 --- /dev/null +++ b/audio/lynx/config/audio_policy_configuration_le_offload_disabled.xml @@ -0,0 +1,260 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6706afc0bc7d435fd27d429177ecae6e19f6a048 Mon Sep 17 00:00:00 2001 From: Yung Ti Su Date: Fri, 15 Jul 2022 10:54:31 +0800 Subject: [PATCH 2/3] add the missing audio_policy_configuration_le_offload_disabled.xml back Test: manual Signed-off-by: Yung Ti Su Change-Id: I28286331bcbff5cff2ecdd772eb564dfde554217 Merged-In: I04fc1306eb15ea2ae102f65b59c1b1cca2070dd1 --- audio/lynx/audio-tables.mk | 1 + ...licy_configuration_le_offload_disabled.xml | 256 ++++++++++++++++++ 2 files changed, 257 insertions(+) create mode 100644 audio/lynx/config/audio_policy_configuration_le_offload_disabled.xml diff --git a/audio/lynx/audio-tables.mk b/audio/lynx/audio-tables.mk index f38db39..812dbce 100644 --- a/audio/lynx/audio-tables.mk +++ b/audio/lynx/audio-tables.mk @@ -24,6 +24,7 @@ PRODUCT_COPY_FILES += \ 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/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.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 diff --git a/audio/lynx/config/audio_policy_configuration_le_offload_disabled.xml b/audio/lynx/config/audio_policy_configuration_le_offload_disabled.xml new file mode 100644 index 0000000..573098e --- /dev/null +++ b/audio/lynx/config/audio_policy_configuration_le_offload_disabled.xml @@ -0,0 +1,256 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1cbb9b31e4ed6c1f5a0a70acc0049ecba97af8a3 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Thu, 14 Jul 2022 21:22:41 +0800 Subject: [PATCH 3/3] init: set vendor.all.modules.ready and vendor.all.devices.ready migrated from init.gs201.rc Bug: 238853979 Signed-off-by: Robin Peng Change-Id: If9f775dffeab9669310ae02e6f2b82f15f6eb1f2 --- init.insmod.lynx.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init.insmod.lynx.cfg b/init.insmod.lynx.cfg index 20202cd..e4eecf5 100644 --- a/init.insmod.lynx.cfg +++ b/init.insmod.lynx.cfg @@ -15,3 +15,5 @@ modprobe|snd-soc-cs40l26.ko # All device specific modules loaded setprop|vendor.device.modules.ready +setprop|vendor.all.modules.ready +setprop|vendor.all.devices.ready