From 6d9031d9cd53484c6197f9037ddfed550f9ada7b Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Thu, 14 Jul 2022 21:19:27 +0000 Subject: [PATCH 01/10] [DO NOT MERGE] Update oriole SVN to 33 Bug: 231380374 Change-Id: I22459fe5e319de297e2cce8ad07763ad182cb1a8 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 6913d87..e48d1a4 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -175,7 +175,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=32 + ro.vendor.build.svn=33 # Hide cutout overlays PRODUCT_PACKAGES += \ From 8a73be36f3a0ee14c7b00dc1f363230c9e88884d Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Thu, 14 Jul 2022 21:19:30 +0000 Subject: [PATCH 02/10] [DO NOT MERGE] Update raven SVN to 33 Bug: 231380374 Change-Id: I0543e2edbdccd9c31d452ea2ed352aafcf40e1ce --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 187ba9a..e52cbad 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -187,7 +187,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=32 + ro.vendor.build.svn=33 # Hide cutout overlays PRODUCT_PACKAGES += \ From dee4003b66b695a65df92c0ebbba37c668886b85 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 15 Jul 2022 02:37:10 +0000 Subject: [PATCH 03/10] Update raven SVN to 34 Bug: 231380374 Change-Id: I9bfa1cd9019ebf0ede5c59de02edc0165156a8c4 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index e52cbad..192d2d8 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -187,7 +187,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=33 + ro.vendor.build.svn=34 # Hide cutout overlays PRODUCT_PACKAGES += \ From 3c1af6c55ee8a88c8cd6c6ae683c817aad4453a3 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 15 Jul 2022 02:35:30 +0000 Subject: [PATCH 04/10] Update oriole SVN to 34 Bug: 231380374 Change-Id: Ie68cb28fb6debb0457ba201de5081624cdfae42b --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index e48d1a4..bbc0a4d 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -175,7 +175,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=33 + ro.vendor.build.svn=34 # Hide cutout overlays PRODUCT_PACKAGES += \ From f04d996f0ac0358043052c4f867bf9056cbfa7dd Mon Sep 17 00:00:00 2001 From: millerliang Date: Wed, 30 Mar 2022 23:30:41 +0800 Subject: [PATCH 05/10] audio: apply new pcm id for immersive output Change to use pcm id 30 for immersive output, which is using raw path in AoC to get lower roundtrip latency. Bug: 237677573 Test: spatial audio playback Change-Id: Ibbd3e70df5f35503673c2834fda7a22cbeaae557 --- audio/oriole/config/audio_platform_configuration.xml | 3 ++- audio/oriole/config/audio_policy_configuration.xml | 2 +- .../audio_policy_configuration_a2dp_offload_disabled.xml | 2 +- .../audio_policy_configuration_le_offload_disabled.xml | 2 +- audio/oriole/config/mixer_paths.xml | 9 ++++++--- audio/raven/config/audio_platform_configuration.xml | 2 +- audio/raven/config/audio_policy_configuration.xml | 2 +- .../audio_policy_configuration_a2dp_offload_disabled.xml | 2 +- .../audio_policy_configuration_le_offload_disabled.xml | 2 +- audio/raven/config/mixer_paths.xml | 9 ++++++--- 10 files changed, 21 insertions(+), 14 deletions(-) diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index 676131b..5923cb9 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -182,7 +182,8 @@ - + + diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index fe4eafb..cb29318 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -65,7 +65,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - - - + @@ -132,6 +133,7 @@ + @@ -142,6 +144,7 @@ + @@ -430,15 +433,15 @@ - + - + - + diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index 676131b..e376ee6 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -182,7 +182,7 @@ - + diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index fe4eafb..cb29318 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -65,7 +65,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - - - + @@ -132,6 +133,7 @@ + @@ -142,6 +144,7 @@ + @@ -430,15 +433,15 @@ - + - + - + From b59a49e27d64bc5a686059055a61d4477cebb6e6 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Thu, 14 Jul 2022 21:19:14 +0800 Subject: [PATCH 06/10] init: set vendor.all.modules.ready and vendor.all.devices.ready migrated from init.gs101.rc Bug: 238853979 Signed-off-by: Robin Peng Change-Id: Ie495fabbbc04c5dd8eac76e27b5e57cb80ad6e55 --- init.insmod.oriole.cfg | 2 ++ init.insmod.raven.cfg | 2 ++ init.insmod.slider.cfg | 2 ++ init.insmod.whitefin.cfg | 2 ++ 4 files changed, 8 insertions(+) diff --git a/init.insmod.oriole.cfg b/init.insmod.oriole.cfg index 8d7ce06..6617a28 100644 --- a/init.insmod.oriole.cfg +++ b/init.insmod.oriole.cfg @@ -12,3 +12,5 @@ modprobe|sec_touch.ko # All device specific modules loaded setprop|vendor.device.modules.ready +setprop|vendor.all.modules.ready +setprop|vendor.all.devices.ready diff --git a/init.insmod.raven.cfg b/init.insmod.raven.cfg index cdbf3f7..d12fc88 100644 --- a/init.insmod.raven.cfg +++ b/init.insmod.raven.cfg @@ -11,3 +11,5 @@ modprobe|sec_touch.ko # All device specific modules loaded setprop|vendor.device.modules.ready +setprop|vendor.all.modules.ready +setprop|vendor.all.devices.ready diff --git a/init.insmod.slider.cfg b/init.insmod.slider.cfg index a877273..89014ba 100644 --- a/init.insmod.slider.cfg +++ b/init.insmod.slider.cfg @@ -19,3 +19,5 @@ wait|/sys/class/leds/vibrator # All device specific modules loaded setprop|vendor.device.modules.ready +setprop|vendor.all.modules.ready +setprop|vendor.all.devices.ready diff --git a/init.insmod.whitefin.cfg b/init.insmod.whitefin.cfg index aa49c61..e8f3444 100644 --- a/init.insmod.whitefin.cfg +++ b/init.insmod.whitefin.cfg @@ -13,3 +13,5 @@ modprobe|sec_touch.ko # All device specific modules loaded setprop|vendor.device.modules.ready +setprop|vendor.all.modules.ready +setprop|vendor.all.devices.ready From e84f193270a8f4399de3aafaadc44c23ffe9d68d Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 15 Jul 2022 04:11:18 +0000 Subject: [PATCH 07/10] Update oriole SVN to 35 Bug: 232157623 Change-Id: Idb1851496006d7f264653dd340a9249996503214 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 4414ffa..4c62246 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -168,7 +168,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=34 + ro.vendor.build.svn=35 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From b1c6546d064b0ff970fbfbeada380ec3b6723456 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 15 Jul 2022 04:14:07 +0000 Subject: [PATCH 08/10] Update raven SVN to 35 Bug: 232157623 Change-Id: Id92594cb62c6978848c8a0d3c7dd4c385e0352ff --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 9d3491f..4599c00 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -178,7 +178,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=34 + ro.vendor.build.svn=35 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 55f68cb55c1fc91d9435035e4008572115f3451d Mon Sep 17 00:00:00 2001 From: Gaurav Sarode Date: Tue, 12 Jul 2022 17:02:51 -0700 Subject: [PATCH 09/10] raviole: Change the BoardConfig layout New structure will make sure all future changes to BoardConfig will be applicable to AAOS on phone builds. bug: 227488008 Test: Local build and wifi works on raven and oriole car builds Change-Id: I928a2fb5cfc876427c382d06d798e684e0691ce9 --- oriole/BoardConfig.mk | 19 ++++++++++--------- raven/BoardConfig.mk | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index af0e7de..dc1db0c 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -16,14 +16,15 @@ ifdef PHONE_CAR_BOARD_PRODUCT include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else - TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt - TARGET_BOOTLOADER_BOARD_NAME := oriole TARGET_SCREEN_DENSITY := 420 - USES_DEVICE_GOOGLE_RAVIOLE := true - BOARD_KERNEL_CMDLINE += disable_dma32=on - - include device/google/gs101/BoardConfig-common.mk - include device/google/gs101/wifi/BoardConfig-wifi.mk - -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk - -include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk endif + +TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt +TARGET_BOOTLOADER_BOARD_NAME := oriole +USES_DEVICE_GOOGLE_RAVIOLE := true +BOARD_KERNEL_CMDLINE += disable_dma32=on + +include device/google/gs101/BoardConfig-common.mk +include device/google/gs101/wifi/BoardConfig-wifi.mk +-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +-include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index bb2f24f..b78d5b4 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -17,14 +17,15 @@ ifdef PHONE_CAR_BOARD_PRODUCT include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else - TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt - TARGET_BOOTLOADER_BOARD_NAME := raven TARGET_SCREEN_DENSITY := 560 - USES_DEVICE_GOOGLE_RAVIOLE := true - BOARD_KERNEL_CMDLINE += disable_dma32=on - - include device/google/gs101/BoardConfig-common.mk - include device/google/gs101/wifi/BoardConfig-wifi.mk - -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk - -include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk endif + +TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt +TARGET_BOOTLOADER_BOARD_NAME := raven +USES_DEVICE_GOOGLE_RAVIOLE := true +BOARD_KERNEL_CMDLINE += disable_dma32=on + +include device/google/gs101/BoardConfig-common.mk +include device/google/gs101/wifi/BoardConfig-wifi.mk +-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +-include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk From 49a124f8cddeceb53541b4362367ff8f43acab4a Mon Sep 17 00:00:00 2001 From: Omer Osman Date: Sun, 3 Jul 2022 18:46:50 +0000 Subject: [PATCH 10/10] Add support for Opus as a BT A2DP offload codec Bug: 226441860 Test: Sink device using bds-dev Change-Id: Ia371622514fa7e9145d41311f39bb422fbe17a36 --- audio/oriole/config/audio_policy_configuration.xml | 6 +++--- .../audio_policy_configuration_le_offload_disabled.xml | 6 +++--- audio/raven/config/audio_policy_configuration.xml | 6 +++--- .../audio_policy_configuration_le_offload_disabled.xml | 6 +++--- audio/slider/config/audio_policy_configuration.xml | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index cb29318..8a8a973 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -163,17 +163,17 @@ + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> diff --git a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml index fc6952d..3c8466a 100644 --- a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml @@ -163,17 +163,17 @@ + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index cb29318..8a8a973 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -163,17 +163,17 @@ + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> diff --git a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml index fc6952d..3c8466a 100644 --- a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml @@ -163,17 +163,17 @@ + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> diff --git a/audio/slider/config/audio_policy_configuration.xml b/audio/slider/config/audio_policy_configuration.xml index 42db5e8..cd66fbc 100644 --- a/audio/slider/config/audio_policy_configuration.xml +++ b/audio/slider/config/audio_policy_configuration.xml @@ -152,17 +152,17 @@ + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> + encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">