From e7fc69f5204c22752e1f340dafb3239a691102d1 Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Thu, 10 Mar 2022 18:30:36 +0000 Subject: [PATCH 1/4] Revert "Update notification PWLE patterns to a higher frequency range" This reverts commit 25c80c8cca56c06932e4ef3d93be94aab7479a93. Reason for revert: This frequency range is still unstable, needs to be validated before it can be used. Bug: 223739586 Change-Id: Id3853b1041d441f80b19965f5875040f2aabb8ab --- .../base/core/res/res/values/config.xml | 48 +++++++++---------- .../base/core/res/res/values/config.xml | 48 +++++++++---------- 2 files changed, 48 insertions(+), 48 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 ed02d61..0b63462 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -236,35 +236,35 @@ --> 0.0 - 160.0 + 60.0 0.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 100.0 0.0 - 160.0 + 60.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 100.0 @@ -277,35 +277,35 @@ --> 0.0 - 160.0 + 60.0 0.0 - 0.24 - 200.0 + 0.4 + 120.0 50.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 50.0 0.0 - 160.0 + 60.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 50.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 50.0 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 966332c..36b7fdf 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -204,35 +204,35 @@ --> 0.0 - 160.0 + 60.0 0.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 100.0 0.0 - 160.0 + 60.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 100.0 @@ -245,35 +245,35 @@ --> 0.0 - 160.0 + 60.0 0.0 - 0.24 - 200.0 + 0.4 + 120.0 50.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 50.0 0.0 - 160.0 + 60.0 100.0 - 0.24 - 200.0 + 0.4 + 120.0 50.0 - 0.24 - 200.0 + 0.4 + 120.0 100.0 0.0 - 160.0 + 60.0 50.0 From b5b42579261775524a43bb8f50aa54005344fe16 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 10 Mar 2022 10:44:27 +0000 Subject: [PATCH 2/4] Bundle handheld_core_hardware.xml Bug: 223543820 Test: Manual, verify build artifacts Change-Id: I60f9c69690de67f83aca795018fd4d1a824446e7 --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ device-slider.mk | 4 ++++ device-whitefin.mk | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 2e3b023..3ee0368 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -238,3 +238,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio_offload.disabled=true \ persist.bluetooth.le_audio_test=true endif + +# Device features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-raven.mk b/device-raven.mk index 96ddd12..91e3942 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -255,3 +255,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio_offload.disabled=true \ persist.bluetooth.le_audio_test=true endif + +# Device features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-slider.mk b/device-slider.mk index 26f8798..647ee73 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -116,3 +116,7 @@ PRODUCT_COPY_FILES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 + +# Device features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-whitefin.mk b/device-whitefin.mk index 69f129d..577092e 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -97,3 +97,7 @@ PRODUCT_COPY_FILES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 + +# Device features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml From e0d3b2b51a17c047a890c68925a333807f8d0bda Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Thu, 10 Mar 2022 16:13:32 -0800 Subject: [PATCH 3/4] DO NOT MERGE Fix build: no vendor specific files in without-vendor Remove vendor-specific codec config and .mk includes in without-vendor branch Change-Id: Iffbd2ee10ed3485c8060f0b3e36e6730fe48fd2b --- device-oriole.mk | 13 ------- device-raven.mk | 13 ------- media_codecs_bo_dolby_c2.xml | 66 ------------------------------------ 3 files changed, 92 deletions(-) delete mode 100644 media_codecs_bo_dolby_c2.xml diff --git a/device-oriole.mk b/device-oriole.mk index e8fb434..e22e0b3 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -217,16 +217,3 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 - -############################################## -# DOLBY integration -include vendor/dolby/ds/dolby-buildspec.mk -$(call inherit-product, vendor/dolby/ds/dolby-product.mk) - -# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml -# with same file but with Dolby codecs listed -PRODUCT_COPY_FILES := \ - device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(PRODUCT_COPY_FILES) - -PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/device-raven.mk b/device-raven.mk index 27d2fc6..4f16dc5 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -233,16 +233,3 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 - -############################################# -# DOLBY integration -include vendor/dolby/ds/dolby-buildspec.mk -$(call inherit-product, vendor/dolby/ds/dolby-product.mk) - -# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml -# with same file but with Dolby codecs listed -PRODUCT_COPY_FILES := \ - device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(PRODUCT_COPY_FILES) - -PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/media_codecs_bo_dolby_c2.xml b/media_codecs_bo_dolby_c2.xml deleted file mode 100644 index 3197674..0000000 --- a/media_codecs_bo_dolby_c2.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From d228473ab412300bf8c93baa2e80bbff6df6e127 Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Mon, 14 Feb 2022 11:01:46 -0800 Subject: [PATCH 4/4] raviole(uwb): update calibration file for uci uwb stack Bug: 186585880 Test: Manual Tests Change-Id: I495a214b6d9141fe0cf7b69fcb6721314721b9cd --- uwb/UWB-calibration.conf | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index 614093a..dbda3f4 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -1,6 +1,4 @@ -[CCC]format=1 -[CCC]kind=0 -[CCC]settings=1 +[CCC]version=2 [CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 [CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 [CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 @@ -110,8 +108,26 @@ xtal_trim=31 temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 -[HAL]antenna_pair_azimuth=4 -[HAL]antenna_pair_elevation=0xff -[HAL]tx_antenna=0 -[HAL]minimum_system_offset_uwbtime0=300 restricted_channels=0 +[HAL]aoa_capability=1 +[HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0 +[HAL]minimum_system_offset_uwbtime0=300 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000