From f4f8fa1fed2444f555f8e9345dbe57e3d8f35c6b Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 8 Apr 2022 16:10:43 +0200 Subject: [PATCH 1/7] Revert "DO NOT MERGE Audio configuration for spatial audio" Bug: 223736548 Test: make This reverts commit edfc5e86bde0ea87e286047161f8ee3e1a022303. Change-Id: Ie693f24b76d00469ad71a36989e481023946c3bb --- audio/oriole/audio-tables.mk | 3 +- audio/oriole/config/audio_effects.xml | 2 - ...uetooth_audio_policy_configuration_7_0.xml | 44 ------------------- audio/raven/audio-tables.mk | 3 +- audio/raven/config/audio_effects.xml | 2 - ...uetooth_audio_policy_configuration_7_0.xml | 44 ------------------- 6 files changed, 2 insertions(+), 96 deletions(-) delete mode 100644 audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml delete mode 100644 audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml diff --git a/audio/oriole/audio-tables.mk b/audio/oriole/audio-tables.mk index abbf589..52e4858 100644 --- a/audio/oriole/audio-tables.mk +++ b/audio/oriole/audio-tables.mk @@ -23,8 +23,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/oriole/config/audio_effects.xml b/audio/oriole/config/audio_effects.xml index e35bfbd..1718057 100644 --- a/audio/oriole/config/audio_effects.xml +++ b/audio/oriole/config/audio_effects.xml @@ -10,7 +10,6 @@ - @@ -52,7 +51,6 @@ - diff --git a/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml deleted file mode 100644 index 3a07ded..0000000 --- a/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/raven/audio-tables.mk b/audio/raven/audio-tables.mk index f2fc29a..b79674e 100644 --- a/audio/raven/audio-tables.mk +++ b/audio/raven/audio-tables.mk @@ -23,8 +23,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/raven/config/audio_effects.xml b/audio/raven/config/audio_effects.xml index e35bfbd..1718057 100644 --- a/audio/raven/config/audio_effects.xml +++ b/audio/raven/config/audio_effects.xml @@ -10,7 +10,6 @@ - @@ -52,7 +51,6 @@ - diff --git a/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml b/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml deleted file mode 100644 index 3a07ded..0000000 --- a/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From fb9b9c83c4d32f0e2bce6d6f36cbe232e331f8bd Mon Sep 17 00:00:00 2001 From: shawnlin Date: Mon, 11 Apr 2022 11:52:09 +0800 Subject: [PATCH 2/7] Update status bar height res to correct size Test: make Bug: 216782082 Change-Id: Ibc23f990e4fda040a86b52f78effce6da0235931 --- oriole/overlay/frameworks/base/core/res/res/values/config.xml | 2 +- raven/overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index 574eed6..614ab27 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -94,7 +94,7 @@ Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. --> 74px - 124px + 118px 74px diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 8d422c3..62a448b 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -199,7 +199,7 @@ Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. --> 28dp - 145px + 130px 28dp From 36e728a38176da361ce005755d1ac0dbd7c1bb96 Mon Sep 17 00:00:00 2001 From: chungkai Date: Mon, 11 Apr 2022 09:05:34 +0000 Subject: [PATCH 3/7] Enable load kernel modules in parallel only enable for launched project. Test: boot to home screen without error and avc denials on R4/O6 Bug: 180676019 Signed-off-by: chungkai Change-Id: I374a25b3c7debcf8a268e62f939a7909b31fe1e8 --- oriole/BoardConfig.mk | 2 ++ raven/BoardConfig.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 1292d4a..96fc801 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -21,6 +21,8 @@ else TARGET_SCREEN_DENSITY := 420 USES_DEVICE_GOOGLE_RAVIOLE := true + BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + include device/google/gs101/BoardConfig-common.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 2b67f76..bb2026f 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -22,6 +22,8 @@ else TARGET_SCREEN_DENSITY := 560 USES_DEVICE_GOOGLE_RAVIOLE := true + BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + include device/google/gs101/BoardConfig-common.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk From 10848fe08164e46de63b2db68fa812551df452d9 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 8 Apr 2022 16:10:43 +0200 Subject: [PATCH 4/7] Revert "DO NOT MERGE Audio configuration for spatial audio" Bug: 223736548 Test: make This reverts commit edfc5e86bde0ea87e286047161f8ee3e1a022303. Change-Id: Ie693f24b76d00469ad71a36989e481023946c3bb --- audio/oriole/audio-tables.mk | 3 +- audio/oriole/config/audio_effects.xml | 2 - ...uetooth_audio_policy_configuration_7_0.xml | 44 ------------------- audio/raven/audio-tables.mk | 3 +- audio/raven/config/audio_effects.xml | 2 - ...uetooth_audio_policy_configuration_7_0.xml | 44 ------------------- 6 files changed, 2 insertions(+), 96 deletions(-) delete mode 100644 audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml delete mode 100644 audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml diff --git a/audio/oriole/audio-tables.mk b/audio/oriole/audio-tables.mk index abbf589..52e4858 100644 --- a/audio/oriole/audio-tables.mk +++ b/audio/oriole/audio-tables.mk @@ -23,8 +23,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/oriole/config/audio_effects.xml b/audio/oriole/config/audio_effects.xml index e35bfbd..1718057 100644 --- a/audio/oriole/config/audio_effects.xml +++ b/audio/oriole/config/audio_effects.xml @@ -10,7 +10,6 @@ - @@ -52,7 +51,6 @@ - diff --git a/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml deleted file mode 100644 index 3a07ded..0000000 --- a/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/raven/audio-tables.mk b/audio/raven/audio-tables.mk index f2fc29a..b79674e 100644 --- a/audio/raven/audio-tables.mk +++ b/audio/raven/audio-tables.mk @@ -23,8 +23,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/raven/config/audio_effects.xml b/audio/raven/config/audio_effects.xml index e35bfbd..1718057 100644 --- a/audio/raven/config/audio_effects.xml +++ b/audio/raven/config/audio_effects.xml @@ -10,7 +10,6 @@ - @@ -52,7 +51,6 @@ - diff --git a/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml b/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml deleted file mode 100644 index 3a07ded..0000000 --- a/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 69e753be8a466a1ee6f2c9e6f570ce542e74d20c Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 8 Apr 2022 16:13:00 +0200 Subject: [PATCH 5/7] Revert "DO NOT MERGE audio: add immersive output" Bug: 223736548 Test: make This reverts commit d91acaba1ad0d0350dcd1e18d9fdddff514a9970. Change-Id: I18aa2cb60403b131dcf353f8b51e831a9f4614da --- .../config/audio_platform_configuration.xml | 1 - .../oriole/config/audio_policy_configuration.xml | 16 ++++++---------- ...olicy_configuration_a2dp_offload_disabled.xml | 10 +++------- audio/oriole/config/mixer_paths.xml | 12 ------------ .../config/audio_platform_configuration.xml | 1 - .../raven/config/audio_policy_configuration.xml | 16 ++++++---------- ...olicy_configuration_a2dp_offload_disabled.xml | 10 +++------- audio/raven/config/mixer_paths.xml | 12 ------------ 8 files changed, 18 insertions(+), 60 deletions(-) diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index f8cd663..6bc6159 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -182,7 +182,6 @@ - diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index 8d732a1..90ee1c3 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -63,10 +63,6 @@ - - - + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> - - - + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> - - - - - - - - - - - - diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index f8cd663..6bc6159 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -182,7 +182,6 @@ - diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index 8d732a1..90ee1c3 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -63,10 +63,6 @@ - - - + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> - - - + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> - - - - - - - - - - - - From 5f85a1763f252b542e59a9a4b7797ba6244c1417 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 8 Apr 2022 16:10:43 +0200 Subject: [PATCH 6/7] resolve merge conflicts of 7b77d473a71025db08e1ff22fa9fa921ef3df641 to tm-dev Revert "DO NOT MERGE Audio configuration for spatial audio" Bug: 223736548 Test: make This reverts commit edfc5e86bde0ea87e286047161f8ee3e1a022303. Change-Id: Ie693f24b76d00469ad71a36989e481023946c3bb --- audio/oriole/audio-tables.mk | 2 +- audio/oriole/config/audio_effects.xml | 2 - ...with_le_audio_policy_configuration_7_0.xml | 71 ------------------- audio/raven/audio-tables.mk | 2 +- audio/raven/config/audio_effects.xml | 2 - ...with_le_audio_policy_configuration_7_0.xml | 71 ------------------- 6 files changed, 2 insertions(+), 148 deletions(-) delete mode 100644 audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml delete mode 100644 audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml diff --git a/audio/oriole/audio-tables.mk b/audio/oriole/audio-tables.mk index 8d15bf9..5c63f40 100644 --- a/audio/oriole/audio-tables.mk +++ b/audio/oriole/audio-tables.mk @@ -25,7 +25,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.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 += \ diff --git a/audio/oriole/config/audio_effects.xml b/audio/oriole/config/audio_effects.xml index e35bfbd..1718057 100644 --- a/audio/oriole/config/audio_effects.xml +++ b/audio/oriole/config/audio_effects.xml @@ -10,7 +10,6 @@ - @@ -52,7 +51,6 @@ - diff --git a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml deleted file mode 100644 index 8b2af59..0000000 --- a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/audio/raven/audio-tables.mk b/audio/raven/audio-tables.mk index 11e20b1..75303c1 100644 --- a/audio/raven/audio-tables.mk +++ b/audio/raven/audio-tables.mk @@ -25,7 +25,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.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 += \ diff --git a/audio/raven/config/audio_effects.xml b/audio/raven/config/audio_effects.xml index e35bfbd..1718057 100644 --- a/audio/raven/config/audio_effects.xml +++ b/audio/raven/config/audio_effects.xml @@ -10,7 +10,6 @@ - @@ -52,7 +51,6 @@ - diff --git a/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml deleted file mode 100644 index e3f27d9..0000000 --- a/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 4c4c40aee67c2542171072288633365291408a8d Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Tue, 12 Apr 2022 17:00:29 +0200 Subject: [PATCH 7/7] Revert "audio: add immersive output" This reverts commit 432fc04f642ae18c899db4613468ca5932ddf6bc. Bug: 223736548 Test: make Change-Id: I242dd4677d0e42e05bed443e4021ca44cddf4daf --- .../config/audio_platform_configuration.xml | 1 - .../config/audio_policy_configuration.xml | 20 ++++++++----------- ...cy_configuration_a2dp_offload_disabled.xml | 10 +++------- ...licy_configuration_le_offload_disabled.xml | 16 ++++++--------- audio/oriole/config/mixer_paths.xml | 12 ----------- .../config/audio_platform_configuration.xml | 1 - .../config/audio_policy_configuration.xml | 20 ++++++++----------- ...cy_configuration_a2dp_offload_disabled.xml | 10 +++------- ...licy_configuration_le_offload_disabled.xml | 16 ++++++--------- audio/raven/config/mixer_paths.xml | 12 ----------- 10 files changed, 34 insertions(+), 84 deletions(-) diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index bf4ff18..f0bec9b 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -182,7 +182,6 @@ - diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index d792e27..ed81992 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -63,10 +63,6 @@ - - - + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> - - - + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> - - - + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> - - - - - - - - - - - - diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index bf4ff18..f0bec9b 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -182,7 +182,6 @@ - diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index d792e27..ed81992 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -63,10 +63,6 @@ - - - + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> - - - + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> - - - + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> - - - - - - - - - - - -