From e8712cc5c12be607d1c5bef6ef6662551a30892e Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:13:09 +0800 Subject: [PATCH 01/60] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Merged-In: Ifde6ab418a18a10b11911cd2e8459f769587f685 Change-Id: Ifde6ab418a18a10b11911cd2e8459f769587f685 --- device-oriole.mk | 3 +-- device-raven.mk | 3 +-- device-slider.mk | 3 +-- device-whitefin.mk | 5 +---- nfc/libnfc-hal-st-debug.conf | 4 ++-- nfc/libnfc-hal-st-disable.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index ee728c3..5a5ab27 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -117,7 +117,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -131,7 +131,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # Vibrator HAL diff --git a/device-raven.mk b/device-raven.mk index b0300b3..bb42519 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -132,7 +132,7 @@ endif PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -146,7 +146,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml diff --git a/device-slider.mk b/device-slider.mk index 647ee73..631ee09 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -84,7 +84,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -97,7 +97,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # PowerStats HAL diff --git a/device-whitefin.mk b/device-whitefin.mk index 577092e..e55b62a 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -76,10 +76,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st - -DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml + android.hardware.nfc-service.st # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf index 5fdaf5e..3b3e1ee 100644 --- a/nfc/libnfc-hal-st-debug.conf +++ b/nfc/libnfc-hal-st-debug.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st-disable.conf b/nfc/libnfc-hal-st-disable.conf index 2b455df..165665e 100644 --- a/nfc/libnfc-hal-st-disable.conf +++ b/nfc/libnfc-hal-st-disable.conf @@ -64,8 +64,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 0035a70..b7599c7 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P From 776917708de059d15266d7ee5a5c0c3b0a338939 Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:13:09 +0800 Subject: [PATCH 02/60] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Merged-In: Ifde6ab418a18a10b11911cd2e8459f769587f685 Change-Id: Ifde6ab418a18a10b11911cd2e8459f769587f685 --- device-oriole.mk | 3 +-- device-raven.mk | 3 +-- device-slider.mk | 3 +-- device-whitefin.mk | 5 +---- nfc/libnfc-hal-st-debug.conf | 4 ++-- nfc/libnfc-hal-st-disable.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index ee728c3..5a5ab27 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -117,7 +117,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -131,7 +131,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # Vibrator HAL diff --git a/device-raven.mk b/device-raven.mk index b0300b3..bb42519 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -132,7 +132,7 @@ endif PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -146,7 +146,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml diff --git a/device-slider.mk b/device-slider.mk index 647ee73..631ee09 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -84,7 +84,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -97,7 +97,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # PowerStats HAL diff --git a/device-whitefin.mk b/device-whitefin.mk index 577092e..e55b62a 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -76,10 +76,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st - -DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml + android.hardware.nfc-service.st # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf index 5fdaf5e..3b3e1ee 100644 --- a/nfc/libnfc-hal-st-debug.conf +++ b/nfc/libnfc-hal-st-debug.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st-disable.conf b/nfc/libnfc-hal-st-disable.conf index 2b455df..165665e 100644 --- a/nfc/libnfc-hal-st-disable.conf +++ b/nfc/libnfc-hal-st-disable.conf @@ -64,8 +64,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 0035a70..b7599c7 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P From aa95ad8897967373e3129e40ce76aada5f0d2d12 Mon Sep 17 00:00:00 2001 From: Zac Iqbal Date: Thu, 9 Jun 2022 18:55:40 +0000 Subject: [PATCH 03/60] Revert "DO NOT MERGE Remove unintended faceauth configs am: a020..." Revert "DO NOT MERGE Remove unintended face config am: 875235afbf" Revert submission 18799414-am-e98f52416a40436ba0044e72d6feed21 Reason for revert: The merge path was only meant for tm-dev. Reverted Changes: I6ace51cab:DO NOT MERGE Remove faceauth from raven am: 783e56... I049a9c205:DO NOT MERGE Remove unintended face config am: 875... I50ae185c6:DO NOT MERGE Remove unintended faceauth configs am... Change-Id: I26f6409b50769dac5509313a32517cb270edc779 --- conf/init.raven.rc | 4 ++++ raven/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 4d35ee1..5153c58 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -11,6 +11,10 @@ on init # Power Stats HAL chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats +on fs + # Face + exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app + on property:vendor.mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd 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 6fd22bc..e945ffd 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -202,6 +202,9 @@ 130px 28dp + + false + 64 From 88cc795721b78b02a14da02201dc7b97934068e8 Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Wed, 22 Jun 2022 12:16:38 +0800 Subject: [PATCH 04/60] uwb: update calibration path for R4 Bug: 233619860 Test: Build pass Signed-off-by: Rex Lin Change-Id: I3f637cdcb211036ca4e057c2d2baab7f2ed6b7b1 --- uwb/uwb_calibration.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index d0585d9..e29bea2 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -16,6 +16,6 @@ LOCAL_UWB_CAL_DIR=device/google/raviole/uwb PRODUCT_COPY_FILES += \ - $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration.conf \ - $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-unknown.conf \ - $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-default.conf \ + $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \ + $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-unknown.conf \ + $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-default.conf \ From c2a3d7ad295ce41c62d802b8d5997d9ae9c80b3c Mon Sep 17 00:00:00 2001 From: JimiChen Date: Thu, 30 Jun 2022 19:32:29 +0800 Subject: [PATCH 05/60] add CAMERA_FIXED_FPS power hint Bug: 233553311 Test: camera CTS Change-Id: I8c83cc734468b9cdd94d85cafbc0c1cfab0708a4 --- powerhint-oriole.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 314f634..a6934b2 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -5,6 +5,7 @@ "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq", "Values": [ "3172000", + "1352000", "1014000", "421000" ], @@ -1133,6 +1134,24 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_FIXED_FPS", + "Node": "MemFreq", + "Duration": 4000, + "Value": "1352000" + }, + { + "PowerHint": "CAMERA_FIXED_FPS", + "Node": "CPUBigClusterMaxFreq", + "Duration": 4000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_FIXED_FPS", + "Node": "CPUBigClusterMinFreq", + "Duration": 4000, + "Value": "1106000" + }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUBigClusterMaxFreq", From e2d48976712da9832eaff82daf10e43507ffb815 Mon Sep 17 00:00:00 2001 From: JimiChen Date: Thu, 30 Jun 2022 19:39:15 +0800 Subject: [PATCH 06/60] camera: enable fixed fps range boost Bug: 233553311 Test: cts Change-Id: I252d2cf0846ba5717fab43a50801d401460cedaf --- device-oriole.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index a2d6522..1346e8c 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -98,6 +98,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/raviole/media_profiles_oriole.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml +PRODUCT_PROPERTY_OVERRIDES += \ + persist.vendor.camera.fixed_fps_range_boost=1 + # Display Config PRODUCT_COPY_FILES += \ device/google/raviole/oriole/display_golden_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_cal0.pb \ From 95ab2f8f9eab1c9b2223160a9bb0d6cad07ded94 Mon Sep 17 00:00:00 2001 From: Martin Liu Date: Thu, 7 Jul 2022 17:01:54 +0800 Subject: [PATCH 07/60] Disable zone dma32 As HW doesn't have 32 bit address limitation, we can disable zone dma32 to simplify memory management and improve performance. Bug: 236225957 Test: boot Signed-off-by: Martin Liu Change-Id: I3297a9a7440e0baf80666152ae9f54e93491f362 --- oriole/BoardConfig.mk | 1 + raven/BoardConfig.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 1292d4a..af0e7de 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -20,6 +20,7 @@ else 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 diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 2b67f76..bb2f24f 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -21,6 +21,7 @@ else 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 From 07e8b01a17cadc8d760482c2b9637c2c597aede8 Mon Sep 17 00:00:00 2001 From: justinweng Date: Tue, 25 Jan 2022 15:45:21 +0800 Subject: [PATCH 08/60] Audio configuration for spatial audio Update audio policy and effect configuration files to support spatial audio feature Bug: 237677573 Test: make Merged-In: I4a7e2eb3c44192954b7bcf804d14097e94e90eb0 Change-Id: I4a7e2eb3c44192954b7bcf804d14097e94e90eb0 --- audio/oriole/audio-tables.mk | 2 +- audio/oriole/config/audio_effects.xml | 2 + .../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 +++-- ...with_le_audio_policy_configuration_7_0.xml | 71 +++++++++++++++++++ audio/oriole/config/mixer_paths.xml | 12 ++++ audio/raven/audio-tables.mk | 2 +- audio/raven/config/audio_effects.xml | 2 + .../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 +++-- ...with_le_audio_policy_configuration_7_0.xml | 71 +++++++++++++++++++ audio/raven/config/mixer_paths.xml | 12 ++++ device-oriole.mk | 7 ++ device-raven.mk | 7 ++ 18 files changed, 246 insertions(+), 36 deletions(-) create mode 100644 audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml create 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 5c63f40..8d15bf9 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 \ - 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 + 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 # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/oriole/config/audio_effects.xml b/audio/oriole/config/audio_effects.xml index 1718057..e35bfbd 100644 --- a/audio/oriole/config/audio_effects.xml +++ b/audio/oriole/config/audio_effects.xml @@ -10,6 +10,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index a4232cd..676131b 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index 5bd7ec8..fe4eafb 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -64,6 +64,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml index a39fcd0..93e3547 100644 --- a/audio/oriole/config/mixer_paths.xml +++ b/audio/oriole/config/mixer_paths.xml @@ -429,6 +429,18 @@ + + + + + + + + + + + + diff --git a/audio/raven/audio-tables.mk b/audio/raven/audio-tables.mk index 75303c1..11e20b1 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 \ - 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 + 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 # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/raven/config/audio_effects.xml b/audio/raven/config/audio_effects.xml index 1718057..e35bfbd 100644 --- a/audio/raven/config/audio_effects.xml +++ b/audio/raven/config/audio_effects.xml @@ -10,6 +10,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index a4232cd..676131b 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index 5bd7ec8..fe4eafb 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -64,6 +64,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml index a39fcd0..93e3547 100644 --- a/audio/raven/config/mixer_paths.xml +++ b/audio/raven/config/mixer_paths.xml @@ -429,6 +429,18 @@ + + + + + + + + + + + + diff --git a/device-oriole.mk b/device-oriole.mk index 95b0201..f6f46a0 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -237,6 +237,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif +# declare use of spatial audio +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.spatializer_enabled=true + +PRODUCT_PACKAGES += \ + libspatialaudio + # 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 db40c4c..3f85f23 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -251,6 +251,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif +# declare use of spatial audio +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.spatializer_enabled=true + +PRODUCT_PACKAGES += \ + libspatialaudio + # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml From 510d08ff177cab13eeaba9e976a1c321c7f747d9 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Wed, 13 Jul 2022 23:45:51 +0000 Subject: [PATCH 09/60] Update oriole SVN to 33 Bug: 232157623 Change-Id: I57a53ccd46e0bed37f1778f6dd834893c89d145c --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 1346e8c..92fe3ed 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=32 + ro.vendor.build.svn=33 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From efd2691e1471df772542b044cd5260d667a38fbf Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Wed, 13 Jul 2022 23:44:29 +0000 Subject: [PATCH 10/60] Update raven SVN to 33 Bug: 232157623 Change-Id: I399f59dd9469d051af756d4783e601b261bf17f6 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index bbc8733..043b850 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=32 + ro.vendor.build.svn=33 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 6d9031d9cd53484c6197f9037ddfed550f9ada7b Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Thu, 14 Jul 2022 21:19:27 +0000 Subject: [PATCH 11/60] [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 12/60] [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 13/60] 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 14/60] 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 15/60] 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 16/60] 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 17/60] 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 18/60] 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 19/60] 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 20/60] 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"> From 46c85eb74536251c469cb8e202cf948f037d7298 Mon Sep 17 00:00:00 2001 From: Sam Ou Date: Fri, 10 Jun 2022 06:33:29 +0000 Subject: [PATCH 21/60] power_profile: update modem power numbers Bug: 209525694 Change-Id: Idb89f5e49e809a5fb41687111a55f07168f3bda3 Signed-off-by: Sam Ou --- .../base/core/res/res/xml/power_profile.xml | 16 ++++++++-------- .../base/core/res/res/xml/power_profile.xml | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml index c4e23c2..e878d40 100644 --- a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -170,15 +170,15 @@ 75 - 0 - 156 - 145 + 2 + 3.5 + 198 - 153 - 212 - 292 - 359 - 471 + 223 + 243 + 298 + 573 + 668 3700 diff --git a/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 1937c0d..bdf30a8 100644 --- a/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -170,15 +170,15 @@ 75 - 0 - 156 - 145 + 2 + 3.5 + 198 - 153 - 212 - 292 - 359 - 471 + 223 + 243 + 298 + 573 + 668 3700 From 6075bd67e6c639de52d0df40058084966d35e27f Mon Sep 17 00:00:00 2001 From: jonerlin Date: Fri, 15 Jul 2022 10:47:19 +0800 Subject: [PATCH 22/60] O6R4: Add Bluetooth A/B firmware property * set A firmware BCM.hcd as default selected fimrware Bug: 229395317 Test: Manually Change-Id: I61d7ef4d476af50fc104c1877060459d14523898 --- device-oriole.mk | 3 ++- device-raven.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 841c551..827e244 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -68,7 +68,8 @@ PRODUCT_COPY_FILES += \ # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.a2dp_aac.vbr_supported=true + persist.bluetooth.a2dp_aac.vbr_supported=true \ + persist.bluetooth.firmware.selection=BCM.hcd # Bluetooth Tx power caps for oriole PRODUCT_COPY_FILES += \ diff --git a/device-raven.mk b/device-raven.mk index 81b31e5..cf27fc2 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -76,7 +76,8 @@ PRODUCT_COPY_FILES += \ # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.a2dp_aac.vbr_supported=true + persist.bluetooth.a2dp_aac.vbr_supported=true \ + persist.bluetooth.firmware.selection=BCM.hcd # Bluetooth Tx power caps for raven PRODUCT_COPY_FILES += \ From 1b8b0de9c8174636b327643fc1b3ac53c4d7d5eb Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Tue, 19 Jul 2022 18:24:17 +0000 Subject: [PATCH 23/60] Update raven SVN to 36 Bug: 232157623 Change-Id: If1887154a1928961a07d4d892f9bb12e76db5b36 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 4599c00..09900d8 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=35 + ro.vendor.build.svn=36 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 9897aff89b8fca80323c7bfa7798059fd9eb6fd6 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Tue, 19 Jul 2022 18:25:42 +0000 Subject: [PATCH 24/60] Update oriole SVN to 36 Bug: 232157623 Change-Id: Id6d742e62ffceb1db753a60a3ae0c376036e2afd --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 4c62246..b652ae5 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=35 + ro.vendor.build.svn=36 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From aa61be1b30ae2e9f8f0570224631692c00747947 Mon Sep 17 00:00:00 2001 From: SianyiHuang Date: Mon, 30 May 2022 12:46:24 +0800 Subject: [PATCH 25/60] Config: Update Auto Brightness debounce and ambient threshold setting for p21 Bug: 234143564 Test: adb shell dumpsys display and check debounce and ambien threshold seting Change-Id: I29c714eb3ff87cf1563f1132e8f6fa7ea1c46ea9 --- .../base/core/res/res/values/config.xml | 153 ++++++++++-------- .../base/core/res/res/values/config.xml | 153 ++++++++++-------- 2 files changed, 174 insertions(+), 132 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 ad976ac..dcb4e39 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -173,7 +173,7 @@ when adapting to brighter or darker environments. This parameter controls how quickly brightness changes occur in response to an observed change in light level that exceeds the hysteresis threshold. --> - 2000 + 1000 4000 @@ -232,73 +232,94 @@ 64 - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 20 - 30 - 40 - 50 - 60 - 70 - 80 - 90 - 100 - + + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 20 + 30 + 40 + 50 + 60 + 70 + 80 + 90 + 100 + 200 + 300 + 400 + 500 + 1000 + 2000 + 3000 + 4000 + - - 11373 - 5000 - 4333 - 3666 - 3000 - 2760 - 2520 - 2280 - 2040 - 1800 - 800 - 527 - 500 - 470 - 396 - 322 - 248 - 174 - 99 - 99 - + + 5186 + 4333 + 3666 + 2999 + 2759 + 2519 + 2279 + 2039 + 1799 + 799 + 527 + 499 + 470 + 517 + 565 + 612 + 660 + 708 + 742 + 636 + 582 + 549 + 369 + 294 + 269 + 220 + 220 + - - 853 - 700 - 683 - 666 - 650 - 640 - 630 - 620 - 610 - 600 - 500 - 500 - 440 - 385 - 348 - 311 - 274 - 237 - 200 - 200 - + + 525 + 683 + 666 + 650 + 640 + 630 + 620 + 610 + 600 + 500 + 500 + 440 + 385 + 382 + 379 + 376 + 373 + 371 + 367 + 387 + 397 + 403 + 380 + 345 + 333 + 283 + 283 + 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 e945ffd..9a49278 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -175,7 +175,7 @@ when adapting to brighter or darker environments. This parameter controls how quickly brightness changes occur in response to an observed change in light level that exceeds the hysteresis threshold. --> - 2000 + 1000 4000 @@ -208,73 +208,94 @@ 64 - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 20 - 30 - 40 - 50 - 60 - 70 - 80 - 90 - 100 - + + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 20 + 30 + 40 + 50 + 60 + 70 + 80 + 90 + 100 + 200 + 300 + 400 + 500 + 1000 + 2000 + 3000 + 4000 + - - 11373 - 5000 - 4333 - 3666 - 3000 - 2760 - 2520 - 2280 - 2040 - 1800 - 800 - 527 - 500 - 470 - 396 - 322 - 248 - 174 - 99 - 99 - + + 5186 + 4333 + 3666 + 2999 + 2759 + 2519 + 2279 + 2039 + 1799 + 799 + 527 + 499 + 470 + 517 + 565 + 612 + 660 + 708 + 742 + 636 + 582 + 549 + 369 + 294 + 269 + 220 + 220 + - - 853 - 700 - 683 - 666 - 650 - 640 - 630 - 620 - 610 - 600 - 500 - 500 - 440 - 385 - 348 - 311 - 274 - 237 - 200 - 200 - + + 525 + 683 + 666 + 650 + 640 + 630 + 620 + 610 + 600 + 500 + 500 + 440 + 385 + 382 + 379 + 376 + 373 + 371 + 367 + 387 + 397 + 403 + 380 + 345 + 333 + 283 + 283 + From 35532a99be728e431f2929e73759e3e047bd10c9 Mon Sep 17 00:00:00 2001 From: jimmyshiu Date: Fri, 24 Jun 2022 07:58:53 +0000 Subject: [PATCH 26/60] Remove universal touch boost Bug: 236781877 Test: PtsUiBench Change-Id: I76b0498c475c2fd839d4938215a80b5f5d10abcb Merged-In: I76b0498c475c2fd839d4938215a80b5f5d10abcb --- powerhint-oriole.json | 63 ---------------------- powerhint-raven.json | 63 ---------------------- powerhint-slider.json | 113 ---------------------------------------- powerhint-whitefin.json | 113 ---------------------------------------- 4 files changed, 352 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index a6934b2..52b054f 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -144,7 +144,6 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "185", "1", "55" ], @@ -1302,58 +1301,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_90HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_90HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -1371,16 +1318,6 @@ "Type": "EndHint", "Value": "INTERACTION" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", diff --git a/powerhint-raven.json b/powerhint-raven.json index 3b9b980..c06d670 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -143,7 +143,6 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "185", "1", "55" ], @@ -1299,58 +1298,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_120HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_120HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -1368,16 +1315,6 @@ "Type": "EndHint", "Value": "INTERACTION" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", diff --git a/powerhint-slider.json b/powerhint-slider.json index 1e2df3f..26af88f 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -143,12 +143,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "185", - "129", - "56", "1", - "183", - "128", "55" ], "ResetOnInit": true @@ -1246,94 +1241,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_120HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "BOOST_90HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "129" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "129" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_120HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -1351,21 +1258,6 @@ "Type": "EndHint", "Value": "INTERACTION" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", @@ -1377,11 +1269,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "DISPLAY_UPDATE_IMMINENT", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, { "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", "Node": "LimitFlashCurrent", diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index a590283..3b10212 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -143,12 +143,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "185", - "129", - "56", "1", - "183", - "128", "55" ], "ResetOnInit": true @@ -1231,94 +1226,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_120HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "BOOST_90HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "129" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "129" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_120HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -1336,21 +1243,6 @@ "Type": "EndHint", "Value": "INTERACTION" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", @@ -1362,11 +1254,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "DISPLAY_UPDATE_IMMINENT", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, { "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", "Node": "LimitFlashCurrent", From e7878d55bc478094a31a0785419e098c057ac902 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Thu, 28 Jul 2022 18:18:23 +0000 Subject: [PATCH 27/60] Update raven SVN to 37 Bug: 238435977 Change-Id: I60bcd193c8299551fb5cc2ec2560c95bf6fa5ff8 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 09900d8..d63decc 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=36 + ro.vendor.build.svn=37 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From c1db891a72a7aa1bf91e220aacec54060ab2ede3 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Thu, 28 Jul 2022 18:17:01 +0000 Subject: [PATCH 28/60] Update oriole SVN to 37 Bug: 238435977 Change-Id: I9e520b94ac33047c01bc1410b7bd2626e3972a59 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index b652ae5..5302e26 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=36 + ro.vendor.build.svn=37 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From dcf3acc81204708fc02106cffb4b0482e881c6c5 Mon Sep 17 00:00:00 2001 From: Beverly Date: Tue, 19 Jul 2022 19:56:40 +0000 Subject: [PATCH 29/60] Update udfps burn in vertical translation So that the mm conversion is less than 1. Bug: 237311757 Test: manual Change-Id: I79ec7b66005d6d79fdec3c63d3a3a28e1c0b46eb --- .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 61f284d..2e0c18b 100644 --- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -52,5 +52,8 @@ 0 + + + 16px From a30ace99c8836d1786aa2a30c871acfab235e7df Mon Sep 17 00:00:00 2001 From: Robert Lee Date: Thu, 21 Jul 2022 17:09:15 +0800 Subject: [PATCH 30/60] audio: enable gapless offload flag Enable gapless support on compressed_offload w/o trimming delay and padding. Bug: 236351705 Test: test with AOSP Music and MediaMonkey Change-Id: Ie23f10d612ee98d6926236de9174aa90e75de415 Signed-off-by: Robert Lee --- audio/oriole/config/audio_policy_configuration.xml | 2 +- audio/oriole/config/mixer_paths.xml | 3 +++ audio/raven/config/audio_policy_configuration.xml | 2 +- audio/raven/config/mixer_paths.xml | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index 8a8a973..1e27950 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -37,7 +37,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD"> diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml index 0fa243b..b7fb719 100644 --- a/audio/oriole/config/mixer_paths.xml +++ b/audio/oriole/config/mixer_paths.xml @@ -30,6 +30,9 @@ + + + diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index 8a8a973..1e27950 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -37,7 +37,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD"> diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml index 0fa243b..b7fb719 100644 --- a/audio/raven/config/mixer_paths.xml +++ b/audio/raven/config/mixer_paths.xml @@ -30,6 +30,9 @@ + + + From 231a75f14a8a4fb471397dd363a2c7b909b8a683 Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Mon, 1 Aug 2022 15:16:20 +0800 Subject: [PATCH 31/60] uwb: support per device calibration for R4 Bug: 240199018 Test: Build pass Change-Id: I45512bba1e0821b4ba32a324aebc7e6b4ec15532 --- device-raven.mk | 1 - uwb/init.uwb.calib.xtal.sh | 26 ++++++++++++++++++++++++++ uwb/uwb_calibration.mk | 7 +++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 uwb/init.uwb.calib.xtal.sh diff --git a/device-raven.mk b/device-raven.mk index 53bbfcd..97fb567 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -41,7 +41,6 @@ include device/google/gs101/fingerprint/udfps_factory.mk endif ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) -include device/google/gs101/uwb/uwb.mk include device/google/raviole/uwb/uwb_calibration.mk endif diff --git a/uwb/init.uwb.calib.xtal.sh b/uwb/init.uwb.calib.xtal.sh new file mode 100644 index 0000000..1fcb876 --- /dev/null +++ b/uwb/init.uwb.calib.xtal.sh @@ -0,0 +1,26 @@ +#!/vendor/bin/sh +# only use xtal_trim from factory calibration +if [ -z "$2" ] +then + echo "usage is $0 input-calibration output_calibration" + exit 0 +fi +OUTPUT_CALIB="$2" +if [ ! -f "$OUTPUT_CALIB" ]; then + touch $OUTPUT_CALIB + chmod 0644 $OUTPUT_CALIB + file="$1" + while IFS=, read -r f1 f2 + do + case $f1 in + "UWB_cal_tx_xtal_reg_final_value") + if [ $((0x$f2)) -gt 63 ]; then + f2=63 + fi + echo 'xtal_trim=0x'$f2 >> $OUTPUT_CALIB + ;; + esac + done <"$file" + exit 0 +fi + diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index e29bea2..2661ad1 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -13,9 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. +# UWB - ultra wide band +$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk) + LOCAL_UWB_CAL_DIR=device/google/raviole/uwb PRODUCT_COPY_FILES += \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-unknown.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-default.conf \ + $(LOCAL_UWB_CAL_DIR)/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \ + +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.uwb.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.uwb.xml From 9ac564fbd01c885b15fbd96a46ec5b96602ee1d5 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 16 Aug 2022 03:26:17 +0000 Subject: [PATCH 32/60] Update oriole SVN to 38 Bug: 242323332 Change-Id: I6dff900e91090b39fc8ed13c935c1a3349be553b --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 5302e26..59a9d63 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=37 + ro.vendor.build.svn=38 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From f045ccd24a1d1b9ffac0c0951b2f158258563b0b Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 16 Aug 2022 03:27:48 +0000 Subject: [PATCH 33/60] Update raven SVN to 38 Bug: 242323332 Change-Id: Ib18dd0e90128a5023d3956a6442747736464595f --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index d63decc..059ed83 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=37 + ro.vendor.build.svn=38 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 17a8dde89ab81c31b56a564bdc42a60f307d5e00 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 3 Aug 2022 23:10:38 -0700 Subject: [PATCH 34/60] Remove FPS boost Bug: 241312961 Test: Build Change-Id: I5fbdc1063d2ac0c468d2a8c5b00293adac7d4179 Signed-off-by: Wei Wang --- powerhint-oriole.json | 7 +++---- powerhint-raven.json | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 52b054f..b3da82b 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -144,8 +144,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "1", - "55" + "1" ], "ResetOnInit": true }, @@ -1287,13 +1286,13 @@ "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", diff --git a/powerhint-raven.json b/powerhint-raven.json index c06d670..ab0fc4e 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -143,8 +143,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "1", - "55" + "1" ], "ResetOnInit": true }, @@ -1279,13 +1278,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "REFRESH_60FPS", From 6c2519cd60c01b45c2638db430b69af3319ac4cb Mon Sep 17 00:00:00 2001 From: David Chao Date: Mon, 15 Aug 2022 18:56:43 +0800 Subject: [PATCH 35/60] thermal: seperate thermal config for charging - Separate thermal config for charger mode and remove the unused thermal throttling. Bug: 240897207 Test: usbc overheating protection and charging throttling worked properly in charger. Change-Id: I63d951575bbd5d5e1ff676fde061f98b0a607881 --- device-oriole.mk | 1 + device-raven.mk | 3 +- thermal_info_config_charge_oriole.json | 483 ++++++++++++++++++++++++ thermal_info_config_charge_raven.json | 499 +++++++++++++++++++++++++ 4 files changed, 985 insertions(+), 1 deletion(-) create mode 100644 thermal_info_config_charge_oriole.json create mode 100644 thermal_info_config_charge_raven.json diff --git a/device-oriole.mk b/device-oriole.mk index 5caee88..0c28cc1 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -60,6 +60,7 @@ PRODUCT_COPY_FILES += \ # Thermal Config PRODUCT_COPY_FILES += \ device/google/raviole/thermal_info_config_oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ + device/google/raviole/thermal_info_config_charge_oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json \ device/google/raviole/thermal_info_config_oriole_WHI_A.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_WHI_A.json # Power HAL config diff --git a/device-raven.mk b/device-raven.mk index 28c0ef8..40a8dc6 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -67,7 +67,8 @@ PRODUCT_COPY_FILES += \ # Thermal Config PRODUCT_COPY_FILES += \ - device/google/raviole/thermal_info_config_raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json + device/google/raviole/thermal_info_config_raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ + device/google/raviole/thermal_info_config_charge_raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json # Power HAL config PRODUCT_COPY_FILES += \ diff --git a/thermal_info_config_charge_oriole.json b/thermal_info_config_charge_oriole.json new file mode 100644 index 0000000..280dd33 --- /dev/null +++ b/thermal_info_config_charge_oriole.json @@ -0,0 +1,483 @@ +{ + "Sensors":[ + { + "Name":"battery", + "Type":"BATTERY", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "60.0" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"gnss_tcxo_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"qi_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"usb_pwr_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"usb_pwr_therm2", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "35.0", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"quiet_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "32.9", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-QI-GNSS", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "qi_therm", + "gnss_tcxo_therm" + ], + "Coefficient":[ + "0.25", + "0.75" + ], + "Offset":-4500, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-QI-BATT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "qi_therm", + "battery" + ], + "Coefficient":[ + "0.22", + "0.78" + ], + "Offset":-500, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB2-DISP", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "disp_therm" + ], + "Coefficient":[ + "0.16", + "0.84" + ], + "Offset":1500, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-QUIET-BATT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "quiet_therm", + "battery" + ], + "Coefficient":[ + "2.15", + "-1.15" + ], + "Offset":-2000, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":[ + "VIRTUAL-QI-GNSS", + "VIRTUAL-QI-BATT", + "VIRTUAL-USB2-DISP", + "VIRTUAL-QUIET-BATT" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0", + "1.0" + ], + "HotThreshold":[ + "NAN", + "39.0", + "41.0", + "43.0", + "45.0", + "47.0", + "55.0" + ], + "HotHysteresis":[ + 0.0, + 1.9, + 1.9, + 1.9, + 1.9, + 1.9, + 1.9 + ], + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "fcc", + "LimitInfo": [0, 2, 3, 3, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 0, 2, 2, 4 ,4 ,4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "dc_icl", + "LimitInfo": [0, 1, 2, 3, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "wlc_fcc", + "LimitInfo": [0, 2, 2, 4, 5, 5, 5], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + } + ] + }, + { + "Name":"USB2-MINUS-USB", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "usb_pwr_therm" + ], + "Coefficient":[ + "1.0", + "-1.0" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"USB2-MINUS-QI", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "qi_therm" + ], + "Coefficient":[ + "1.0", + "-1.0" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB-THROTTLING", + "Type":"USB_PORT", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "usb_pwr_therm2", + "Combination":[ + "usb_pwr_therm2", + "USB2-MINUS-USB", + "USB2-MINUS-QI" + ], + "Coefficient":[ + "35000", + "2000", + "10000" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "3.0", + "NAN", + "NAN" + ], + "BindedCdevInfo": [ + { + "CdevRequest": "usbc-port", + "LimitInfo": [0, 0, 0, 0, 1, 1, 1] + } + ], + "VrThreshold":"NAN", + "Multiplier":1, + "PollingDelay":60000, + "PassiveDelay":7000 + } + ], + "CoolingDevices":[ + { + "Name":"fcc", + "Type":"BATTERY" + }, + { + "Name":"dc_icl", + "Type":"BATTERY" + }, + { + "Name":"wlc_fcc", + "Type":"BATTERY" + }, + { + "Name":"usbc-port", + "Type":"BATTERY" + } + ], + "PowerRails":[ + { + "Name":"PPVAR_VSYS_PWR_DISP" + }, + { + "Name":"VSYS_PWR_MODEM" + }, + { + "Name":"S2M_VDD_CPUCL2", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + + }, + { + "Name":"S3M_VDD_CPUCL1", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S4M_VDD_CPUCL0", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S5M_VDD_INT" + }, + { + "Name":"S1M_VDD_MIF" + }, + { + "Name":"S2S_VDD_G3D", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"POWER_FOR_CHARGING_THROTTLING", + "VirtualRails":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "VSYS_PWR_MODEM", + "S2M_VDD_CPUCL2", + "S3M_VDD_CPUCL1", + "S4M_VDD_CPUCL0", + "S5M_VDD_INT", + "S1M_VDD_MIF", + "S2S_VDD_G3D" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0" + ], + "PowerSampleDelay":14000, + "PowerSampleCount":5 + } + ] +} diff --git a/thermal_info_config_charge_raven.json b/thermal_info_config_charge_raven.json new file mode 100644 index 0000000..411383b --- /dev/null +++ b/thermal_info_config_charge_raven.json @@ -0,0 +1,499 @@ +{ + "Sensors":[ + { + "Name":"battery", + "Type":"BATTERY", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "60.0" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"neutral_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"gnss_tcxo_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"qi_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"quiet_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "32.2", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"usb_pwr_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"usb_pwr_therm2", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "40.0", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-NEUTRAL-QI", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "neutral_therm", + "qi_therm" + ], + "Coefficient":[ + "0.6", + "0.4" + ], + "Offset":-3000, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB2-BATT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "battery" + ], + "Coefficient":[ + "0.05", + "0.95" + ], + "Offset":1000, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-GNSS-BATT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "gnss_tcxo_therm", + "battery" + ], + "Coefficient":[ + "0.50", + "0.50" + ], + "Offset":1500, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-QI-DISP", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "qi_therm", + "disp_therm" + ], + "Coefficient":[ + "0.15", + "0.85" + ], + "Offset":2000, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":[ + "VIRTUAL-NEUTRAL-QI", + "VIRTUAL-USB2-BATT", + "VIRTUAL-GNSS-BATT", + "VIRTUAL-QI-DISP" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0", + "1.0" + ], + "HotThreshold":[ + "NAN", + "39.0", + "41.0", + "43.0", + "45.0", + "47.0", + "55.0" + ], + "HotHysteresis":[ + 0.0, + 1.9, + 1.9, + 1.9, + 1.9, + 1.9, + 1.9 + ], + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "fcc", + "LimitInfo": [0, 2, 3, 3, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], + "CdevFloorWithPowerLink": [0, 0, 2, 2, 3 ,4 ,4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "dc_icl", + "LimitInfo": [0, 1, 2, 3, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 2, 3, 3, 4, 4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "wlc_fcc", + "LimitInfo": [0, 3, 3, 4, 5, 5, 5], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 5, 5], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + } + ] + }, + { + "Name":"USB2-MINUS-USB", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "usb_pwr_therm" + ], + "Coefficient":[ + "1.0", + "-1.0" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"USB2-MINUS-QI", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "qi_therm" + ], + "Coefficient":[ + "1.0", + "-1.0" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB-THROTTLING", + "Type":"USB_PORT", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "usb_pwr_therm2", + "Combination":[ + "usb_pwr_therm2", + "USB2-MINUS-USB", + "USB2-MINUS-QI" + ], + "Coefficient":[ + "40000", + "4500", + "9000" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "3.0", + "NAN", + "NAN" + ], + "BindedCdevInfo": [ + { + "CdevRequest": "usbc-port", + "LimitInfo": [0, 0, 0, 0, 1, 1, 1] + } + ], + "VrThreshold":"NAN", + "Multiplier":1, + "PollingDelay":60000, + "PassiveDelay":7000 + } + ], + "CoolingDevices":[ + { + "Name":"fcc", + "Type":"BATTERY" + }, + { + "Name":"dc_icl", + "Type":"BATTERY" + }, + { + "Name":"wlc_fcc", + "Type":"BATTERY" + }, + { + "Name":"usbc-port", + "Type":"BATTERY" + } + ], + "PowerRails":[ + { + "Name":"PPVAR_VSYS_PWR_DISP" + }, + { + "Name":"VSYS_PWR_MODEM" + }, + { + "Name":"S2M_VDD_CPUCL2", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + + }, + { + "Name":"S3M_VDD_CPUCL1", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S4M_VDD_CPUCL0", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S5M_VDD_INT" + }, + { + "Name":"S1M_VDD_MIF" + }, + { + "Name":"S2S_VDD_G3D", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"POWER_FOR_CHARGING_THROTTLING", + "VirtualRails":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "VSYS_PWR_MODEM", + "S2M_VDD_CPUCL2", + "S3M_VDD_CPUCL1", + "S4M_VDD_CPUCL0", + "S5M_VDD_INT", + "S1M_VDD_MIF", + "S2S_VDD_G3D" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0" + ], + "PowerSampleDelay":14000, + "PowerSampleCount":5 + } + ] +} From e756c1ac0b9b66cb7d57ccfed5c33ec0317140f8 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 23 Aug 2022 17:47:08 +0000 Subject: [PATCH 36/60] Update raven SVN to 39 Bug: 242323332 Change-Id: Ie2fa1633ae2638688993ee8b58148b4f48b85dc8 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 059ed83..d6e54e7 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=38 + ro.vendor.build.svn=39 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From c9c61f444fb3a9fc7b4fa227874aea5c677122e9 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Wed, 10 Aug 2022 18:59:17 +0000 Subject: [PATCH 37/60] Enable ADPF CPU hints for SF Allow these devices to send CPU hints to PowerHAL from SF to reduce drops and save power. Bug: 195990840 Test: manual Change-Id: I915bf64a669c176e53542752760f21e3a696a57b Merged-In: I915bf64a669c176e53542752760f21e3a696a57b (cherry picked from commit 0f365e08b67aefc8519f224561ef4530460ad4b9) --- conf/init.raviole.rc | 8 ++++++++ device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ powerhint-oriole.json | 22 ---------------------- powerhint-raven.json | 28 ---------------------------- 5 files changed, 16 insertions(+), 50 deletions(-) diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc index 31ff159..1437c49 100644 --- a/conf/init.raviole.rc +++ b/conf/init.raviole.rc @@ -66,3 +66,11 @@ on property:persist.vendor.se.ese2.mode=ctsmode on property:sys.retaildemo.enabled=1 setprop persist.vendor.charge.stop.level 35 setprop persist.vendor.charge.start.level 30 + +# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints +on property:sys.boot_completed=1 + trigger override-sf-uclamp + +on override-sf-uclamp + write /proc/vendor_sched/rt_uclamp_min 0 + write /proc/vendor_sched/sf_uclamp_min 0 diff --git a/device-oriole.mk b/device-oriole.mk index 0c28cc1..0fccfe3 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -259,3 +259,7 @@ PRODUCT_COPY_FILES := \ $(PRODUCT_COPY_FILES) PRODUCT_RESTRICT_VENDOR_FILES := false + +# Enable adpf cpu hint session for SurfaceFlinger +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + debug.sf.enable_adpf_cpu_hint=true diff --git a/device-raven.mk b/device-raven.mk index 40a8dc6..466e07a 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -272,3 +272,7 @@ PRODUCT_COPY_FILES := \ $(PRODUCT_COPY_FILES) PRODUCT_RESTRICT_VENDOR_FILES := false + +# Enable adpf cpu hint session for SurfaceFlinger +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + debug.sf.enable_adpf_cpu_hint=true diff --git a/powerhint-oriole.json b/powerhint-oriole.json index b3da82b..3df86a4 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -157,16 +157,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "161", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -484,12 +474,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -508,12 +492,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-raven.json b/powerhint-raven.json index ab0fc4e..d3bd49c 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -156,16 +156,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "161", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -483,12 +473,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -501,12 +485,6 @@ "Duration": 5000, "Value": "0" }, - { - "PowerHint": "LAUNCH_120FPS", - "Node": "SFUClampBoost", - "Duration": 1000, - "Value": "161" - }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", @@ -518,12 +496,6 @@ "Type": "DoHint", "Value": "LAUNCH_120FPS" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", From 73f513b4c7421681178d8eb473e680701c6c8d28 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 23 Aug 2022 17:45:47 +0000 Subject: [PATCH 38/60] Update oriole SVN to 39 Bug: 242323332 Change-Id: I52d214c492b7dc2ee2699b248cac0b8e67bfc996 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 59a9d63..aa541dc 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=38 + ro.vendor.build.svn=39 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From faeed09cb525bb4d566c07135fec0f9e65eaf516 Mon Sep 17 00:00:00 2001 From: Yang Qi Date: Tue, 23 Aug 2022 22:15:41 +0000 Subject: [PATCH 39/60] calibration: update CCC minimum system offset for raven Change the value to wait on the get session state and start command on SE side to an optimal value after tuning Bug: 237644730 Test: see b/237644730 Change-Id: Id5c743e71008c414398afb8750d2adafedee9a04 --- uwb/UWB-calibration.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index e8061b2..061fed9 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -134,7 +134,7 @@ restricted_channels=0 [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=500 +[HAL]minimum_system_offset_uwbtime0=120 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 From b47b3032b1ed6dc9d43ae0fe2b1927f9054464d2 Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Mon, 1 Aug 2022 15:14:30 +0800 Subject: [PATCH 40/60] uwb: update country configs for R4 Bug: 240199018 Test: Build pass Signed-off-by: Rex Lin Change-Id: Ief481c3f14dbce4c3d8a65d12960f4a76dd9d3f6 --- uwb/Android.mk | 26 ++++ uwb/UWB-calibration-ce.conf | 141 ++++++++++++++++++ uwb/UWB-calibration-default.conf | 141 ++++++++++++++++++ uwb/UWB-calibration-fcc.conf | 141 ++++++++++++++++++ ...libration.conf => UWB-calibration-jp.conf} | 99 ++++++------ uwb/UWB-calibration-restricted.conf | 141 ++++++++++++++++++ uwb/UWB-calibration-tw.conf | 141 ++++++++++++++++++ uwb/country_conf_gen.sh | 31 ++++ uwb/uwb_calibration.mk | 6 +- uwb/uwb_country.conf | 62 ++++++++ 10 files changed, 877 insertions(+), 52 deletions(-) create mode 100644 uwb/Android.mk create mode 100644 uwb/UWB-calibration-ce.conf create mode 100644 uwb/UWB-calibration-default.conf create mode 100644 uwb/UWB-calibration-fcc.conf rename uwb/{UWB-calibration.conf => UWB-calibration-jp.conf} (70%) create mode 100644 uwb/UWB-calibration-restricted.conf create mode 100644 uwb/UWB-calibration-tw.conf create mode 100755 uwb/country_conf_gen.sh create mode 100644 uwb/uwb_country.conf diff --git a/uwb/Android.mk b/uwb/Android.mk new file mode 100644 index 0000000..3a1cac4 --- /dev/null +++ b/uwb/Android.mk @@ -0,0 +1,26 @@ + +# +# Copyright (C) 2022 The Android Open-Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# WARNING: Everything listed here will be built on ALL platforms, +# including x86, the universal, and the SDK. Modules must be uniquely +# named (liblights.panda), and must build everywhere, or limit themselves +# to only building on ARM if they include assembly. Individual makefiles +# are responsible for having their own logic, for fine-grained control. +LOCAL_PATH:= $(call my-dir) +LOCAL_UWB_CAL_DIR=$(LOCAL_PATH) +DEVICE_UWB_CAL_DIR=$(TARGET_OUT_VENDOR)/etc/uwb +$(shell ($(LOCAL_UWB_CAL_DIR)/country_conf_gen.sh $(LOCAL_UWB_CAL_DIR) $(DEVICE_UWB_CAL_DIR))) + diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf new file mode 100644 index 0000000..1117a6a --- /dev/null +++ b/uwb/UWB-calibration-ce.conf @@ -0,0 +1,141 @@ +[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 +[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch5.prf64.pdoa_offset=0 +[CCC]ant0.ch9.prf64.pdoa_offset=0 +[CCC]ant0.ch5.prf64.pll_locking_code=0 +[CCC]ant0.ch9.prf64.pll_locking_code=0 +[CCC]id=0 +[CCC]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +ant0.ch5.prf16.ant_delay=16414 +ant0.ch5.prf16.tx_power=0x4B4B234B +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x34 +ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.tx_power=0x4B4B234B +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x34 +ant0.ch9.prf16.ant_delay=16426 +ant0.ch9.prf16.tx_power=0x53532B53 +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x34 +ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.tx_power=0x53532B53 +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x34 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16446 +ant1.ch5.prf16.tx_power=0x6B6B336B +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x34 +ant1.ch5.prf64.ant_delay=16446 +ant1.ch5.prf64.tx_power=0x6B6B336B +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x34 +ant1.ch9.prf16.ant_delay=16429 +ant1.ch9.prf16.tx_power=0 +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0 +ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.tx_power=0 +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16446 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16446 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16429 +ant2.ch9.prf16.tx_power=0x47472347 +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x34 +ant2.ch9.prf64.ant_delay=16429 +ant2.ch9.prf64.tx_power=0x47472347 +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x34 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16446 +ant3.ch5.prf16.tx_power=0 +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16446 +ant3.ch5.prf64.tx_power=0 +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16429 +ant3.ch9.prf16.tx_power=0x47472347 +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0x34 +ant3.ch9.prf64.ant_delay=16429 +ant3.ch9.prf64.tx_power=0x47472347 +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0x34 +ant3.port=1 +ant3.selector_gpio=6 +ant3.selector_gpio_value=1 +ant0.ant1.ch5.pdoa_offset=0 +ant0.ant1.ch9.pdoa_offset=0 +ant0.ant2.ch5.pdoa_offset=0 +ant0.ant2.ch9.pdoa_offset=0 +ant1.ant2.ch5.pdoa_offset=0 +ant1.ant2.ch9.pdoa_offset=0 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=-4710 +ant1.ant3.ch9.pdoa_offset=-6144 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant3.ch5.pdoa_lut=e1:f2:85:f5:ae:f3:3d:f6:52:f4:f6:f6:8f:f4:9a:f7:48:f5:52:f8:d7:f5:0a:f9:66:f6:ae:f9:85:f7:66:fa:8f:f8:1f:fb:48:f9:d7:fb:8f:fa:7b:fc:ec:fb:33:fd:0a:fd:ec:fd:66:fe:a4:fe:00:00:48:ff:71:01:00:00:b8:02:b8:00:29:04:64:01:ae:05:19:02:85:07:cb:02:33:09:7d:03:f6:0a:2f:04:0a:0d:e3:04:cd:0e:96:05:14:10:48:06:71:11:fa:06:66:12:ac:07:33:13:60:08:3d:14:12:09:85:15:c5:09:ec:15:77:0a +ant1.ant3.ch9.pdoa_lut=e1:ec:f6:f6:48:ed:3d:f6:85:ed:85:f5:14:ee:9a:f7:3d:ee:52:f8:e1:ee:0a:f9:3d:f0:ae:f9:85:f1:66:fa:85:f3:1f:fb:00:f6:d7:fb:9a:f7:7b:fc:14:fa:33:fd:ec:fb:ec:fd:71:fd:a4:fe:cd:fe:48:ff:a4:00:00:00:85:01:b8:00:7b:02:5c:01:d7:03:14:02:cd:04:cd:02:48:07:85:03:ae:09:29:04:e1:0c:e1:04:7b:10:9a:05:cd:12:52:06:f6:14:f6:06:a4:16:ae:07:ae:17:0a:09:d7:17:c3:09:52:18:66:08:7b:18:7b:0a +xtal_trim=31 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +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 = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 +[HAL]minimum_system_offset_uwbtime0=120 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf new file mode 100644 index 0000000..b08a0f4 --- /dev/null +++ b/uwb/UWB-calibration-default.conf @@ -0,0 +1,141 @@ +[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 +[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch5.prf64.pdoa_offset=0 +[CCC]ant0.ch9.prf64.pdoa_offset=0 +[CCC]ant0.ch5.prf64.pll_locking_code=0 +[CCC]ant0.ch9.prf64.pll_locking_code=0 +[CCC]id=0 +[CCC]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +ant0.ch5.prf16.ant_delay=16414 +ant0.ch5.prf16.tx_power=0x47472347 +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x34 +ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.tx_power=0x47472347 +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x34 +ant0.ch9.prf16.ant_delay=16426 +ant0.ch9.prf16.tx_power=0x47472347 +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x34 +ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.tx_power=0x47472347 +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x34 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16446 +ant1.ch5.prf16.tx_power=0x5B5B2B5B +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x20 +ant1.ch5.prf64.ant_delay=16446 +ant1.ch5.prf64.tx_power=0x5B5B2B5B +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x20 +ant1.ch9.prf16.ant_delay=16429 +ant1.ch9.prf16.tx_power=0 +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0 +ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.tx_power=0 +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16446 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16446 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16429 +ant2.ch9.prf16.tx_power=0x5F5F2F5F +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x26 +ant2.ch9.prf64.ant_delay=16429 +ant2.ch9.prf64.tx_power=0x5F5F2F5F +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x26 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16446 +ant3.ch5.prf16.tx_power=0 +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16446 +ant3.ch5.prf64.tx_power=0 +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16429 +ant3.ch9.prf16.tx_power=0x5F5F2F5F +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0x26 +ant3.ch9.prf64.ant_delay=16429 +ant3.ch9.prf64.tx_power=0x5F5F2F5F +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0x26 +ant3.port=1 +ant3.selector_gpio=6 +ant3.selector_gpio_value=1 +ant0.ant1.ch5.pdoa_offset=0 +ant0.ant1.ch9.pdoa_offset=0 +ant0.ant2.ch5.pdoa_offset=0 +ant0.ant2.ch9.pdoa_offset=0 +ant1.ant2.ch5.pdoa_offset=0 +ant1.ant2.ch9.pdoa_offset=0 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=-4710 +ant1.ant3.ch9.pdoa_offset=-6144 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant3.ch5.pdoa_lut=e1:f2:85:f5:ae:f3:3d:f6:52:f4:f6:f6:8f:f4:9a:f7:48:f5:52:f8:d7:f5:0a:f9:66:f6:ae:f9:85:f7:66:fa:8f:f8:1f:fb:48:f9:d7:fb:8f:fa:7b:fc:ec:fb:33:fd:0a:fd:ec:fd:66:fe:a4:fe:00:00:48:ff:71:01:00:00:b8:02:b8:00:29:04:64:01:ae:05:19:02:85:07:cb:02:33:09:7d:03:f6:0a:2f:04:0a:0d:e3:04:cd:0e:96:05:14:10:48:06:71:11:fa:06:66:12:ac:07:33:13:60:08:3d:14:12:09:85:15:c5:09:ec:15:77:0a +ant1.ant3.ch9.pdoa_lut=e1:ec:f6:f6:48:ed:3d:f6:85:ed:85:f5:14:ee:9a:f7:3d:ee:52:f8:e1:ee:0a:f9:3d:f0:ae:f9:85:f1:66:fa:85:f3:1f:fb:00:f6:d7:fb:9a:f7:7b:fc:14:fa:33:fd:ec:fb:ec:fd:71:fd:a4:fe:cd:fe:48:ff:a4:00:00:00:85:01:b8:00:7b:02:5c:01:d7:03:14:02:cd:04:cd:02:48:07:85:03:ae:09:29:04:e1:0c:e1:04:7b:10:9a:05:cd:12:52:06:f6:14:f6:06:a4:16:ae:07:ae:17:0a:09:d7:17:c3:09:52:18:66:08:7b:18:7b:0a +xtal_trim=31 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +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 = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 +[HAL]minimum_system_offset_uwbtime0=120 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf new file mode 100644 index 0000000..b08a0f4 --- /dev/null +++ b/uwb/UWB-calibration-fcc.conf @@ -0,0 +1,141 @@ +[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 +[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch5.prf64.pdoa_offset=0 +[CCC]ant0.ch9.prf64.pdoa_offset=0 +[CCC]ant0.ch5.prf64.pll_locking_code=0 +[CCC]ant0.ch9.prf64.pll_locking_code=0 +[CCC]id=0 +[CCC]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +ant0.ch5.prf16.ant_delay=16414 +ant0.ch5.prf16.tx_power=0x47472347 +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x34 +ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.tx_power=0x47472347 +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x34 +ant0.ch9.prf16.ant_delay=16426 +ant0.ch9.prf16.tx_power=0x47472347 +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x34 +ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.tx_power=0x47472347 +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x34 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16446 +ant1.ch5.prf16.tx_power=0x5B5B2B5B +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x20 +ant1.ch5.prf64.ant_delay=16446 +ant1.ch5.prf64.tx_power=0x5B5B2B5B +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x20 +ant1.ch9.prf16.ant_delay=16429 +ant1.ch9.prf16.tx_power=0 +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0 +ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.tx_power=0 +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16446 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16446 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16429 +ant2.ch9.prf16.tx_power=0x5F5F2F5F +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x26 +ant2.ch9.prf64.ant_delay=16429 +ant2.ch9.prf64.tx_power=0x5F5F2F5F +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x26 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16446 +ant3.ch5.prf16.tx_power=0 +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16446 +ant3.ch5.prf64.tx_power=0 +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16429 +ant3.ch9.prf16.tx_power=0x5F5F2F5F +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0x26 +ant3.ch9.prf64.ant_delay=16429 +ant3.ch9.prf64.tx_power=0x5F5F2F5F +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0x26 +ant3.port=1 +ant3.selector_gpio=6 +ant3.selector_gpio_value=1 +ant0.ant1.ch5.pdoa_offset=0 +ant0.ant1.ch9.pdoa_offset=0 +ant0.ant2.ch5.pdoa_offset=0 +ant0.ant2.ch9.pdoa_offset=0 +ant1.ant2.ch5.pdoa_offset=0 +ant1.ant2.ch9.pdoa_offset=0 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=-4710 +ant1.ant3.ch9.pdoa_offset=-6144 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant3.ch5.pdoa_lut=e1:f2:85:f5:ae:f3:3d:f6:52:f4:f6:f6:8f:f4:9a:f7:48:f5:52:f8:d7:f5:0a:f9:66:f6:ae:f9:85:f7:66:fa:8f:f8:1f:fb:48:f9:d7:fb:8f:fa:7b:fc:ec:fb:33:fd:0a:fd:ec:fd:66:fe:a4:fe:00:00:48:ff:71:01:00:00:b8:02:b8:00:29:04:64:01:ae:05:19:02:85:07:cb:02:33:09:7d:03:f6:0a:2f:04:0a:0d:e3:04:cd:0e:96:05:14:10:48:06:71:11:fa:06:66:12:ac:07:33:13:60:08:3d:14:12:09:85:15:c5:09:ec:15:77:0a +ant1.ant3.ch9.pdoa_lut=e1:ec:f6:f6:48:ed:3d:f6:85:ed:85:f5:14:ee:9a:f7:3d:ee:52:f8:e1:ee:0a:f9:3d:f0:ae:f9:85:f1:66:fa:85:f3:1f:fb:00:f6:d7:fb:9a:f7:7b:fc:14:fa:33:fd:ec:fb:ec:fd:71:fd:a4:fe:cd:fe:48:ff:a4:00:00:00:85:01:b8:00:7b:02:5c:01:d7:03:14:02:cd:04:cd:02:48:07:85:03:ae:09:29:04:e1:0c:e1:04:7b:10:9a:05:cd:12:52:06:f6:14:f6:06:a4:16:ae:07:ae:17:0a:09:d7:17:c3:09:52:18:66:08:7b:18:7b:0a +xtal_trim=31 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +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 = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 +[HAL]minimum_system_offset_uwbtime0=120 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration-jp.conf similarity index 70% rename from uwb/UWB-calibration.conf rename to uwb/UWB-calibration-jp.conf index 061fed9..6b5dd3f 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration-jp.conf @@ -12,79 +12,79 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16450 -ant0.ch5.prf16.tx_power=0x4E4E4E4E +ant0.ch5.prf16.ant_delay=16414 +ant0.ch5.prf16.tx_power=0 ant0.ch5.prf16.pg_count=0 -ant0.ch5.prf16.pg_delay=0x26 -ant0.ch5.prf64.ant_delay=16450 -ant0.ch5.prf64.tx_power=0x4E4E4E4E +ant0.ch5.prf16.pg_delay=0 +ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.tx_power=0 ant0.ch5.prf64.pg_count=0 -ant0.ch5.prf64.pg_delay=0x26 -ant0.ch9.prf16.ant_delay=16410 -ant0.ch9.prf16.tx_power=0x56565656 +ant0.ch5.prf64.pg_delay=0 +ant0.ch9.prf16.ant_delay=16426 +ant0.ch9.prf16.tx_power=0x2A2A2A2A ant0.ch9.prf16.pg_count=0 -ant0.ch9.prf16.pg_delay=0x26 -ant0.ch9.prf64.ant_delay=16410 -ant0.ch9.prf64.tx_power=0x56565656 +ant0.ch9.prf16.pg_delay=0x20 +ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.tx_power=0x2A2A2A2A ant0.ch9.prf64.pg_count=0 -ant0.ch9.prf64.pg_delay=0x26 +ant0.ch9.prf64.pg_delay=0x20 ant0.port=0 ant0.selector_gpio=7 ant0.selector_gpio_value=0 -ant1.ch5.prf16.ant_delay=16450 -ant1.ch5.prf16.tx_power=0x4E4E4E4E +ant1.ch5.prf16.ant_delay=16446 +ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 -ant1.ch5.prf16.pg_delay=0x26 -ant1.ch5.prf64.ant_delay=16450 -ant1.ch5.prf64.tx_power=0x4E4E4E4E +ant1.ch5.prf16.pg_delay=0 +ant1.ch5.prf64.ant_delay=16446 +ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 -ant1.ch5.prf64.pg_delay=0x26 -ant1.ch9.prf16.ant_delay=16410 -ant1.ch9.prf16.tx_power=0x56565656 +ant1.ch5.prf64.pg_delay=0 +ant1.ch9.prf16.ant_delay=16429 +ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 -ant1.ch9.prf16.pg_delay=0x26 -ant1.ch9.prf64.ant_delay=16410 -ant1.ch9.prf64.tx_power=0x56565656 +ant1.ch9.prf16.pg_delay=0 +ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 -ant1.ch9.prf64.pg_delay=0x26 +ant1.ch9.prf64.pg_delay=0 ant1.port=0 ant1.selector_gpio=7 ant1.selector_gpio_value=1 -ant2.ch5.prf16.ant_delay=16450 -ant2.ch5.prf16.tx_power=0x4E4E4E4E +ant2.ch5.prf16.ant_delay=16446 +ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 -ant2.ch5.prf16.pg_delay=0x26 -ant2.ch5.prf64.ant_delay=16450 -ant2.ch5.prf64.tx_power=0x4E4E4E4E +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16446 +ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 -ant2.ch5.prf64.pg_delay=0x26 -ant2.ch9.prf16.ant_delay=16410 -ant2.ch9.prf16.tx_power=0x56565656 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16429 +ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 -ant2.ch9.prf16.pg_delay=0x26 -ant2.ch9.prf64.ant_delay=16410 -ant2.ch9.prf64.tx_power=0x56565656 +ant2.ch9.prf16.pg_delay=0 +ant2.ch9.prf64.ant_delay=16429 +ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 -ant2.ch9.prf64.pg_delay=0x26 +ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16450 -ant3.ch5.prf16.tx_power=0x4E4E4E4E +ant3.ch5.prf16.ant_delay=16446 +ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 -ant3.ch5.prf16.pg_delay=0x26 -ant3.ch5.prf64.ant_delay=16450 -ant3.ch5.prf64.tx_power=0x4E4E4E4E +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16446 +ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 -ant3.ch5.prf64.pg_delay=0x26 -ant3.ch9.prf16.ant_delay=16410 -ant3.ch9.prf16.tx_power=0x56565656 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16429 +ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 -ant3.ch9.prf16.pg_delay=0x26 -ant3.ch9.prf64.ant_delay=16410 -ant3.ch9.prf64.tx_power=0x56565656 +ant3.ch9.prf16.pg_delay=0 +ant3.ch9.prf64.ant_delay=16429 +ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 -ant3.ch9.prf64.pg_delay=0x26 +ant3.ch9.prf64.pg_delay=0 ant3.port=1 ant3.selector_gpio=6 ant3.selector_gpio_value=1 @@ -108,7 +108,8 @@ xtal_trim=31 temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 -restricted_channels=0 +alternate_pulse_shape=0x01 +restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf new file mode 100644 index 0000000..14552c3 --- /dev/null +++ b/uwb/UWB-calibration-restricted.conf @@ -0,0 +1,141 @@ +[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 +[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch5.prf64.pdoa_offset=0 +[CCC]ant0.ch9.prf64.pdoa_offset=0 +[CCC]ant0.ch5.prf64.pll_locking_code=0 +[CCC]ant0.ch9.prf64.pll_locking_code=0 +[CCC]id=0 +[CCC]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +ant0.ch5.prf16.ant_delay=16414 +ant0.ch5.prf16.tx_power=0x47472347 +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x34 +ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.tx_power=0x47472347 +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x34 +ant0.ch9.prf16.ant_delay=16426 +ant0.ch9.prf16.tx_power=0x47472347 +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x34 +ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.tx_power=0x47472347 +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x34 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16446 +ant1.ch5.prf16.tx_power=0x5B5B2B5B +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x20 +ant1.ch5.prf64.ant_delay=16446 +ant1.ch5.prf64.tx_power=0x5B5B2B5B +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x20 +ant1.ch9.prf16.ant_delay=16429 +ant1.ch9.prf16.tx_power=0 +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0 +ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.tx_power=0 +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16446 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16446 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16429 +ant2.ch9.prf16.tx_power=0x5F5F2F5F +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x26 +ant2.ch9.prf64.ant_delay=16429 +ant2.ch9.prf64.tx_power=0x5F5F2F5F +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x26 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16446 +ant3.ch5.prf16.tx_power=0 +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16446 +ant3.ch5.prf64.tx_power=0 +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16429 +ant3.ch9.prf16.tx_power=0x5F5F2F5F +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0x26 +ant3.ch9.prf64.ant_delay=16429 +ant3.ch9.prf64.tx_power=0x5F5F2F5F +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0x26 +ant3.port=1 +ant3.selector_gpio=6 +ant3.selector_gpio_value=1 +ant0.ant1.ch5.pdoa_offset=0 +ant0.ant1.ch9.pdoa_offset=0 +ant0.ant2.ch5.pdoa_offset=0 +ant0.ant2.ch9.pdoa_offset=0 +ant1.ant2.ch5.pdoa_offset=0 +ant1.ant2.ch9.pdoa_offset=0 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=-4710 +ant1.ant3.ch9.pdoa_offset=-6144 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant3.ch5.pdoa_lut=e1:f2:85:f5:ae:f3:3d:f6:52:f4:f6:f6:8f:f4:9a:f7:48:f5:52:f8:d7:f5:0a:f9:66:f6:ae:f9:85:f7:66:fa:8f:f8:1f:fb:48:f9:d7:fb:8f:fa:7b:fc:ec:fb:33:fd:0a:fd:ec:fd:66:fe:a4:fe:00:00:48:ff:71:01:00:00:b8:02:b8:00:29:04:64:01:ae:05:19:02:85:07:cb:02:33:09:7d:03:f6:0a:2f:04:0a:0d:e3:04:cd:0e:96:05:14:10:48:06:71:11:fa:06:66:12:ac:07:33:13:60:08:3d:14:12:09:85:15:c5:09:ec:15:77:0a +ant1.ant3.ch9.pdoa_lut=e1:ec:f6:f6:48:ed:3d:f6:85:ed:85:f5:14:ee:9a:f7:3d:ee:52:f8:e1:ee:0a:f9:3d:f0:ae:f9:85:f1:66:fa:85:f3:1f:fb:00:f6:d7:fb:9a:f7:7b:fc:14:fa:33:fd:ec:fb:ec:fd:71:fd:a4:fe:cd:fe:48:ff:a4:00:00:00:85:01:b8:00:7b:02:5c:01:d7:03:14:02:cd:04:cd:02:48:07:85:03:ae:09:29:04:e1:0c:e1:04:7b:10:9a:05:cd:12:52:06:f6:14:f6:06:a4:16:ae:07:ae:17:0a:09:d7:17:c3:09:52:18:66:08:7b:18:7b:0a +xtal_trim=31 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +restricted_channels=0xffff +[HAL]aoa_capability=1 +[HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 +[HAL]minimum_system_offset_uwbtime0=120 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf new file mode 100644 index 0000000..95c0d2a --- /dev/null +++ b/uwb/UWB-calibration-tw.conf @@ -0,0 +1,141 @@ +[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 +[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch5.prf64.pdoa_offset=0 +[CCC]ant0.ch9.prf64.pdoa_offset=0 +[CCC]ant0.ch5.prf64.pll_locking_code=0 +[CCC]ant0.ch9.prf64.pll_locking_code=0 +[CCC]id=0 +[CCC]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +ant0.ch5.prf16.ant_delay=16414 +ant0.ch5.prf16.tx_power=0x47472347 +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x34 +ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.tx_power=0x47472347 +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x34 +ant0.ch9.prf16.ant_delay=16426 +ant0.ch9.prf16.tx_power=0x47472347 +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x34 +ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.tx_power=0x47472347 +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x34 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16446 +ant1.ch5.prf16.tx_power=0x5B5B2B5B +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x20 +ant1.ch5.prf64.ant_delay=16446 +ant1.ch5.prf64.tx_power=0x5B5B2B5B +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x20 +ant1.ch9.prf16.ant_delay=16429 +ant1.ch9.prf16.tx_power=0 +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0 +ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.tx_power=0 +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16446 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16446 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16429 +ant2.ch9.prf16.tx_power=0x5F5F2F5F +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x26 +ant2.ch9.prf64.ant_delay=16429 +ant2.ch9.prf64.tx_power=0x5F5F2F5F +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x26 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16446 +ant3.ch5.prf16.tx_power=0 +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16446 +ant3.ch5.prf64.tx_power=0 +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16429 +ant3.ch9.prf16.tx_power=0x5F5F2F5F +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0x26 +ant3.ch9.prf64.ant_delay=16429 +ant3.ch9.prf64.tx_power=0x5F5F2F5F +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0x26 +ant3.port=1 +ant3.selector_gpio=6 +ant3.selector_gpio_value=1 +ant0.ant1.ch5.pdoa_offset=0 +ant0.ant1.ch9.pdoa_offset=0 +ant0.ant2.ch5.pdoa_offset=0 +ant0.ant2.ch9.pdoa_offset=0 +ant1.ant2.ch5.pdoa_offset=0 +ant1.ant2.ch9.pdoa_offset=0 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=-4710 +ant1.ant3.ch9.pdoa_offset=-6144 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant3.ch5.pdoa_lut=e1:f2:85:f5:ae:f3:3d:f6:52:f4:f6:f6:8f:f4:9a:f7:48:f5:52:f8:d7:f5:0a:f9:66:f6:ae:f9:85:f7:66:fa:8f:f8:1f:fb:48:f9:d7:fb:8f:fa:7b:fc:ec:fb:33:fd:0a:fd:ec:fd:66:fe:a4:fe:00:00:48:ff:71:01:00:00:b8:02:b8:00:29:04:64:01:ae:05:19:02:85:07:cb:02:33:09:7d:03:f6:0a:2f:04:0a:0d:e3:04:cd:0e:96:05:14:10:48:06:71:11:fa:06:66:12:ac:07:33:13:60:08:3d:14:12:09:85:15:c5:09:ec:15:77:0a +ant1.ant3.ch9.pdoa_lut=e1:ec:f6:f6:48:ed:3d:f6:85:ed:85:f5:14:ee:9a:f7:3d:ee:52:f8:e1:ee:0a:f9:3d:f0:ae:f9:85:f1:66:fa:85:f3:1f:fb:00:f6:d7:fb:9a:f7:7b:fc:14:fa:33:fd:ec:fb:ec:fd:71:fd:a4:fe:cd:fe:48:ff:a4:00:00:00:85:01:b8:00:7b:02:5c:01:d7:03:14:02:cd:04:cd:02:48:07:85:03:ae:09:29:04:e1:0c:e1:04:7b:10:9a:05:cd:12:52:06:f6:14:f6:06:a4:16:ae:07:ae:17:0a:09:d7:17:c3:09:52:18:66:08:7b:18:7b:0a +xtal_trim=31 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +restricted_channels=0x20 +[HAL]aoa_capability=1 +[HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 +[HAL]minimum_system_offset_uwbtime0=120 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000 diff --git a/uwb/country_conf_gen.sh b/uwb/country_conf_gen.sh new file mode 100755 index 0000000..7e398c0 --- /dev/null +++ b/uwb/country_conf_gen.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# This script is used to generate uwb conuntry configuration file, +# and the PRODUCT_COPY_FILES list in uwb.mk based on uwb_country.conf +# Bug: 196073172, 233619860 + +count=1 + +mkdir -p $2 + +while read line ; do + if [[ "$line" =~ ^"*" ]]; then + header=${line:1} + elif [[ "$line" =~ ^"\"" ]]; then + #line=$(echo ${line/,} | tr -d "\"") + country[count]=$(echo $line | cut -d ':' -f1 | tr -d "\"") + code[count]=$(echo $line | cut -d ':' -f2 | tr -d "\"" | tr -d " ") + if [ "$header" = "FCC" ]; then + cp $1/UWB-calibration-fcc.conf $2/UWB-calibration-${code[$count]}.conf + elif [ "$header" = "CE" ]; then + cp $1/UWB-calibration-ce.conf $2/UWB-calibration-${code[$count]}.conf + elif [ "$header" = "JP" ]; then + cp $1/UWB-calibration-jp.conf $2/UWB-calibration-${code[$count]}.conf + elif [ "$header" = "TW" ]; then + cp $1/UWB-calibration-tw.conf $2/UWB-calibration-${code[$count]}.conf + elif [ "$header" = "Restricted" ]; then + cp $1/UWB-calibration-restricted.conf $2/UWB-calibration-${code[$count]}.conf + fi + fi +((count++)) +done < $1/uwb_country.conf diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index 2661ad1..3889a08 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -19,9 +19,9 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk) LOCAL_UWB_CAL_DIR=device/google/raviole/uwb PRODUCT_COPY_FILES += \ - $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \ - $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-unknown.conf \ - $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-default.conf \ + $(LOCAL_UWB_CAL_DIR)/UWB-calibration-restricted.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-unknown.conf \ + $(LOCAL_UWB_CAL_DIR)/UWB-calibration-default.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-default.conf \ + $(LOCAL_UWB_CAL_DIR)/UWB-calibration-default.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \ $(LOCAL_UWB_CAL_DIR)/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \ PRODUCT_COPY_FILES += \ diff --git a/uwb/uwb_country.conf b/uwb/uwb_country.conf new file mode 100644 index 0000000..93a5e2e --- /dev/null +++ b/uwb/uwb_country.conf @@ -0,0 +1,62 @@ +*FCC +"United States": "us" +"Canada": "ca" + +*CE +"Austria": "at" +"Belgium": "be" +"Bulgaria": "bg" +"Croatia": "hr" +"Cyprus": "cy" +"Czech Republic": "cz" +"Denmark": "dk" +"Estonia": "ee" +"Finland": "fi" +"France": "fr" +"Germany": "de" +"Greece": "gr" +"Hungary": "hu" +"Ireland Republic of (EIRE)": "ie" +"Italy": "it" +"Latvia": "lv" +"Lithuania": "lt" +"Luxembourg": "lu" +"Malta": "mt" +"Netherlands": "nl" +"Poland": "pl" +"Portugal": "pt" +"Romania": "ro" +"Slovakia": "sk" +"Slovenia": "si" +"Spain": "es" +"Sweden": "se" +"United Kingdom (Great Britain)": "gb" +"Northern Ireland": "ni" +"Iceland": "is" +"Liechtenstein": "li" +"Norway": "no" +"Switzerland": "ch" + +*JP +"Japan": "jp" + +*TW +"Taiwan": "tw" + +*Restricted +"Argentina": "ar" +"Armenia": "am" +"Azerbaijan": "az" +"Belarus": "by" +"Indonesia": "id" +"Kazakhstan": "kz" +"Kyrgyzstan": "kg" +"Nepal": "np" +"Pakistan": "pk" +"Paraguay": "py" +"Russia": "ru" +"Solomon Islands": "sb" +"Tajikistan": "tj" +"Turkmenistanr": "tm" +"Ukraine": "ua" +"Uzbekistan": "uz" From f256ffbd631c4e7e8ac03c42a46957620192cf65 Mon Sep 17 00:00:00 2001 From: linpeter Date: Fri, 19 Aug 2022 15:17:11 +0800 Subject: [PATCH 41/60] update dimming usage property Bug: 234327328 test: check value of property Change-Id: I7e927908cb534fd111820eae74471d459fbe7434 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index f472089..16b8cb7 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -109,7 +109,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/raven/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb #config of display brightness dimming -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.brightness.dimming.usage=1 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.dimming.usage=1 # NFC PRODUCT_COPY_FILES += \ From 0ada3b4ed6145d0f2ee03f015a56e5c09cac8b03 Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Wed, 31 Aug 2022 19:24:48 +0800 Subject: [PATCH 42/60] bt: update bt a2dp offload capabilities * set BtA2dpOffloadCap value to sbc-aac-aptx-aptxhd-ldac-opus in bt_vendor_overlay.conf to suppot OPUS offloading. Bug: 243958304 Test: manully Change-Id: I0a8aee4d42446213f158856a2f2777958893df82 --- bluetooth/bt_vendor_overlay.conf | 3 +++ device-oriole.mk | 2 ++ device-raven.mk | 2 ++ 3 files changed, 7 insertions(+) create mode 100644 bluetooth/bt_vendor_overlay.conf diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf new file mode 100644 index 0000000..d5212db --- /dev/null +++ b/bluetooth/bt_vendor_overlay.conf @@ -0,0 +1,3 @@ +# This is BTBCM HAL overlay configuration file. + +BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus diff --git a/device-oriole.mk b/device-oriole.mk index 4e922c7..4b03e1b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -214,6 +214,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # Bluetooth HAL PRODUCT_PACKAGES += \ bt_vendor.conf +PRODUCT_COPY_FILES += \ + device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf # tetheroffload HAL PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 16b8cb7..6077922 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -227,6 +227,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # Bluetooth HAL PRODUCT_PACKAGES += \ bt_vendor.conf +PRODUCT_COPY_FILES += \ + device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf # tetheroffload HAL PRODUCT_PACKAGES += \ From 166cece76f9e1c0c143080196beb4d7125fe62a5 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 30 Aug 2022 03:03:26 +0000 Subject: [PATCH 43/60] Config dex2oat according to thermal status Config dex2oat cpuset and thread count according to thermal status. LIGHT cpuset = 0,1,2,3,4,5 thread = 6 MODERATE cpuset = 0,1,2,3 thread = 4 SEVERE cpuset = 0,1,2,3 thread = 4 CRITICAL cpuset = 0,1,2,3 thread = 2 EMERGENCY cpuset = 0,1,2,3 thread = 1 Bug: 242948832 Test: build pass Change-Id: I96d7f010254f8c3d826ed09da18e32d6055d4bb5 --- powerhint-oriole.json | 394 +++++++++++++++++++++++++++++++++--------- powerhint-raven.json | 394 +++++++++++++++++++++++++++++++++--------- 2 files changed, 632 insertions(+), 156 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 3df86a4..c21ee8c 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -471,6 +471,28 @@ "1" ], "DefaultIndex": 0 + }, + { + "Name": "Dex2oatThreads", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-threads", + "Values": [ + "1", + "2", + "4", + "6", + "8" + ], + "Type": "Property" + }, + { + "Name": "Dex2oatCPUSet", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-cpu-set", + "Values": [ + "0,1,2,3", + "0,1,2,3,4,5", + "0,1,2,3,4,5,6,7" + ], + "Type": "Property" } ], "Actions": [ @@ -1330,6 +1352,138 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "6" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3,4,5" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "Node": "PMU_POLL", @@ -1384,6 +1538,168 @@ "Duration": 0, "Value": "60000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", @@ -1456,78 +1772,6 @@ "Duration": 1000, "Value": "1" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, { "PowerHint": "ML_ACC", "Node": "MLUclampBoost", @@ -1551,12 +1795,6 @@ "Node": "RestrictedCpuset", "Duration": 0, "Value": "0-3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" } ], "AdpfConfig": [ diff --git a/powerhint-raven.json b/powerhint-raven.json index d3bd49c..64bc60a 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -470,6 +470,28 @@ "1" ], "DefaultIndex": 0 + }, + { + "Name": "Dex2oatThreads", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-threads", + "Values": [ + "1", + "2", + "4", + "6", + "8" + ], + "Type": "Property" + }, + { + "Name": "Dex2oatCPUSet", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-cpu-set", + "Values": [ + "0,1,2,3", + "0,1,2,3,4,5", + "0,1,2,3,4,5,6,7" + ], + "Type": "Property" } ], "Actions": [ @@ -1321,6 +1343,138 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "6" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3,4,5" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "Node": "PMU_POLL", @@ -1375,6 +1529,168 @@ "Duration": 0, "Value": "60000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", @@ -1447,78 +1763,6 @@ "Duration": 1000, "Value": "1" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, { "PowerHint": "ML_ACC", "Node": "MLUclampBoost", @@ -1542,12 +1786,6 @@ "Node": "RestrictedCpuset", "Duration": 0, "Value": "0-3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" } ], "AdpfConfig": [ From 47d623aeff9f33cfabc25d81d832a4ec0673ca5e Mon Sep 17 00:00:00 2001 From: juyuchen Date: Wed, 31 Aug 2022 12:33:25 +0800 Subject: [PATCH 44/60] audio: enable gapless offload for trimming data Bug: 233723867 Test: manual audio tests Signed-off-by: juyuchen Change-Id: I4e67b18abde5b6d33ddd62776722a252ac1dfacd --- audio/oriole/config/mixer_paths.xml | 2 +- audio/raven/config/mixer_paths.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml index b7fb719..d877752 100644 --- a/audio/oriole/config/mixer_paths.xml +++ b/audio/oriole/config/mixer_paths.xml @@ -31,7 +31,7 @@ - + diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml index b7fb719..d877752 100644 --- a/audio/raven/config/mixer_paths.xml +++ b/audio/raven/config/mixer_paths.xml @@ -31,7 +31,7 @@ - + From 493ca504256e0a884b2f81b428342d2c71d1fe04 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 18 Aug 2022 03:16:52 +0000 Subject: [PATCH 45/60] Remove RestrictedCpuset hint With systemui now changed its cpuset in early stage, we no longer need RestrictedCpuset hint as workaround. Bug: 242775562 Test: build pass Change-Id: If041b589a9df7de0a932df59ee3436adcb449fd9 --- powerhint-oriole.json | 21 --------------------- powerhint-raven.json | 21 --------------------- 2 files changed, 42 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index c21ee8c..6114e8a 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -212,15 +212,6 @@ ], "ResetOnInit": true }, - { - "Name": "RestrictedCpuset", - "Path": "/dev/cpuset/restricted/cpus", - "Values": [ - "0-3", - "0-7" - ], - "ResetOnInit": false - }, { "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", @@ -1783,18 +1774,6 @@ "Node": "PMQoSCpuDmaLatency", "Duration": 2000, "Value": "44" - }, - { - "PowerHint": "DEVICE_IDLE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" } ], "AdpfConfig": [ diff --git a/powerhint-raven.json b/powerhint-raven.json index 64bc60a..18d1324 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -211,15 +211,6 @@ ], "ResetOnInit": true }, - { - "Name": "RestrictedCpuset", - "Path": "/dev/cpuset/restricted/cpus", - "Values": [ - "0-3", - "0-7" - ], - "ResetOnInit": false - }, { "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", @@ -1774,18 +1765,6 @@ "Node": "PMQoSCpuDmaLatency", "Duration": 2000, "Value": "44" - }, - { - "PowerHint": "DEVICE_IDLE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" } ], "AdpfConfig": [ From eec44318a5d34ff7773803c0ace71dc3ffbd5fa4 Mon Sep 17 00:00:00 2001 From: millerliang Date: Wed, 7 Sep 2022 13:59:37 +0800 Subject: [PATCH 46/60] audio: adjust the latency for immersive playback To meet the av sync, we need to adjust the uc latency for immersive playback. Bug: 243645548 Test: Test with av sync video Change-Id: I5980c8833e168f859b541eeab7d093c206857233 --- audio/oriole/config/audio_platform_configuration.xml | 4 ++++ audio/raven/config/audio_platform_configuration.xml | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index 5923cb9..35bf66f 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -219,6 +219,10 @@ + + + + diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index e376ee6..35bf66f 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + @@ -218,6 +219,10 @@ + + + + From 773d299c592f99895a445431404ee02fd457d5b9 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 9 Sep 2022 19:18:06 +0000 Subject: [PATCH 47/60] Update raven SVN to 40 Bug: 244460991 Change-Id: I8ea100a65a16413c660087a9a2eb2282a3f179a4 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index d6e54e7..0f62834 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=39 + ro.vendor.build.svn=40 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 00838c077ce811ba7da99e8dd4ceab694e85753e Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 9 Sep 2022 19:16:57 +0000 Subject: [PATCH 48/60] Update oriole SVN to 40 Bug: 244460991 Change-Id: Idfb4a5de8e33727367abc8df9342b44bbc4bd64b --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index aa541dc..f65f3e6 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=39 + ro.vendor.build.svn=40 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 8b8e4a89cadd2d594a411d72fdb4a924ee70f51f Mon Sep 17 00:00:00 2001 From: Yang Qi Date: Wed, 7 Sep 2022 21:07:58 +0000 Subject: [PATCH 49/60] calibration: update CCC minimum system offset to 250 for raven Bug: 244622298 Test: see b/244622298 Change-Id: I9c46b8e740f0d389264dd64b866a264d65d2d122 --- uwb/UWB-calibration-ce.conf | 2 +- uwb/UWB-calibration-default.conf | 2 +- uwb/UWB-calibration-fcc.conf | 2 +- uwb/UWB-calibration-jp.conf | 2 +- uwb/UWB-calibration-restricted.conf | 2 +- uwb/UWB-calibration-tw.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index 1117a6a..231e286 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -134,7 +134,7 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 -[HAL]minimum_system_offset_uwbtime0=120 +[HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf index b08a0f4..5e99376 100644 --- a/uwb/UWB-calibration-default.conf +++ b/uwb/UWB-calibration-default.conf @@ -134,7 +134,7 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 -[HAL]minimum_system_offset_uwbtime0=120 +[HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index b08a0f4..5e99376 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -134,7 +134,7 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 -[HAL]minimum_system_offset_uwbtime0=120 +[HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 6b5dd3f..9dfc069 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -135,7 +135,7 @@ restricted_channels=0x20 [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=120 +[HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf index 14552c3..338d4f6 100644 --- a/uwb/UWB-calibration-restricted.conf +++ b/uwb/UWB-calibration-restricted.conf @@ -134,7 +134,7 @@ restricted_channels=0xffff [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 -[HAL]minimum_system_offset_uwbtime0=120 +[HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf index 95c0d2a..685469d 100644 --- a/uwb/UWB-calibration-tw.conf +++ b/uwb/UWB-calibration-tw.conf @@ -134,7 +134,7 @@ restricted_channels=0x20 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 -[HAL]minimum_system_offset_uwbtime0=120 +[HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 From 681e2c28c9ed592f3fcf68a81c9df9bf96b8e765 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 15 Sep 2022 22:21:05 +0800 Subject: [PATCH 50/60] Remove frequency boost of big cores for FACE_UNLOCK Bug: 245619770 Test: build Change-Id: I75d0f1a73b194124030d3c7ddbcea56631031943 --- powerhint-oriole.json | 12 ------------ powerhint-raven.json | 12 ------------ powerhint-slider.json | 12 ------------ powerhint-whitefin.json | 12 ------------ 4 files changed, 48 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 6114e8a..ff13f2a 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1691,18 +1691,6 @@ "Duration": 0, "Value": "0,1,2,3" }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_LITTLE_TSKIN_BYPASS", diff --git a/powerhint-raven.json b/powerhint-raven.json index 18d1324..2ec1508 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -1682,18 +1682,6 @@ "Duration": 0, "Value": "0,1,2,3" }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_LITTLE_TSKIN_BYPASS", diff --git a/powerhint-slider.json b/powerhint-slider.json index 26af88f..4c50d32 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -1347,18 +1347,6 @@ "Duration": 0, "Value": "60000" }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index 3b10212..b7f5dea 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -1326,18 +1326,6 @@ "Duration": 0, "Value": "60000" }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", From d8637b8ac47ea0354b2b155d379205acaa753e05 Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Mon, 12 Sep 2022 16:58:17 -0700 Subject: [PATCH 51/60] raven: remove unused udfps_illumination_transition_ms Bug: 243818429 Test: N/A Change-Id: I4d0be5127c251b0d414fd5defae77609673c03ed Merged-In: I4d0be5127c251b0d414fd5defae77609673c03ed --- raven/overlay/frameworks/base/core/res/res/values/config.xml | 5 ----- 1 file changed, 5 deletions(-) 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 9a49278..7c7b5b7 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -183,11 +183,6 @@ http://www.gstatic.com/android/sms/G8V0U.xml - - 25 - 0.3 From 0f700d6226e540a4f9a41cc7251f40b380b40977 Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Mon, 12 Sep 2022 16:57:07 -0700 Subject: [PATCH 52/60] oriole: remove unused udfps_illumination_transition_ms Bug: 243818429 Test: N/A Change-Id: Ied840bbf22a52a96e8d1df58058ff091aad776e5 Merged-In: Ied840bbf22a52a96e8d1df58058ff091aad776e5 --- .../overlay/frameworks/base/core/res/res/values/config.xml | 5 ----- 1 file changed, 5 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 dcb4e39..13aa728 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -217,11 +217,6 @@ 60 - - 34 - 0.3 From 7570035fe78e4edf00290baedf5def32ef38334d Mon Sep 17 00:00:00 2001 From: vincenttew Date: Tue, 20 Sep 2022 07:45:15 +0000 Subject: [PATCH 53/60] audio: extand the period number of hifi usecase extend this to prevent alsa trigger stop playback and causing pop Bug: 238056484 Signed-off-by: vincenttew Change-Id: I3f422169a8bccbeece0c97b3ba515d99f7dab2e2 --- audio/oriole/config/audio_platform_configuration.xml | 4 ++-- audio/raven/config/audio_platform_configuration.xml | 4 ++-- audio/slider/config/audio_platform_configuration.xml | 4 ++-- audio/whitefin/config/audio_platform_configuration.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index 35bf66f..fa5571c 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -200,8 +200,8 @@ - - + + diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index 35bf66f..fa5571c 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -200,8 +200,8 @@ - - + + diff --git a/audio/slider/config/audio_platform_configuration.xml b/audio/slider/config/audio_platform_configuration.xml index bc63066..3d183b0 100644 --- a/audio/slider/config/audio_platform_configuration.xml +++ b/audio/slider/config/audio_platform_configuration.xml @@ -136,8 +136,8 @@ - - + + diff --git a/audio/whitefin/config/audio_platform_configuration.xml b/audio/whitefin/config/audio_platform_configuration.xml index bc63066..3d183b0 100644 --- a/audio/whitefin/config/audio_platform_configuration.xml +++ b/audio/whitefin/config/audio_platform_configuration.xml @@ -136,8 +136,8 @@ - - + + From 45c70632925cb5538cca72d762b5f483291738f0 Mon Sep 17 00:00:00 2001 From: Richard Chang Date: Fri, 16 Sep 2022 07:36:50 +0000 Subject: [PATCH 54/60] powerhint: clean up unused hints in R4/O6 INTERACTION and LAUNCH_120FPS are removed but some actions still use them. Bug: 246738037 Test: pts-tradefed run commandAndExit pts -m PtsPerformanceTestCases -t com.google.android.perf.pts.PowerHintJsonVerifyTest Change-Id: I6747ad6b0e953f063aad083218a86024c41999a6 --- powerhint-oriole.json | 5 ----- powerhint-raven.json | 15 --------------- 2 files changed, 20 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index ff13f2a..cbbbbae 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1303,11 +1303,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", diff --git a/powerhint-raven.json b/powerhint-raven.json index 2ec1508..a232909 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -504,11 +504,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "LAUNCH_120FPS" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -1271,11 +1266,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "LAUNCH_120FPS" - }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", "Node": "TAUClampBoost", @@ -1294,11 +1284,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", From 3967133ce01a5f2da685c5b2dd99a97d9272d4bc Mon Sep 17 00:00:00 2001 From: Taeju Park Date: Wed, 21 Sep 2022 18:25:15 -0700 Subject: [PATCH 55/60] Add Ownership to powerhint files Bug: 248115959 Signed-off-by: Taeju Park Change-Id: I9ba486e3be19b90e44583f2a3b8ec9d7050c7ceb --- OWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 OWNERS diff --git a/OWNERS b/OWNERS new file mode 100644 index 0000000..5aee848 --- /dev/null +++ b/OWNERS @@ -0,0 +1 @@ +per-file powerhint-*.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com From f0d6b36e9a7e9a9206eeaac5ac651ff73e453469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Tue, 13 Sep 2022 01:56:24 +0000 Subject: [PATCH 56/60] Set Lyric camera_hardware variable. Bug: 240478511 Test: presubmit Change-Id: Iaf6682c9677353b6caecd0f31effa41abee7bc8a Merged-In: Iaf6682c9677353b6caecd0f31effa41abee7bc8a --- device-oriole.mk | 2 ++ device-raven.mk | 2 ++ device-slider.mk | 2 ++ device-whitefin.mk | 2 ++ 4 files changed, 8 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index f375829..a3e81fb 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -41,6 +41,8 @@ else include device/google/gs101/fingerprint/udfps_factory.mk endif +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,oriole) $(call soong_config_set,lyric,tuning_product,oriole) $(call soong_config_set,google3a_config,target_device,oriole) diff --git a/device-raven.mk b/device-raven.mk index 15ea022..63abc9d 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -46,6 +46,8 @@ endif include hardware/google/pixel/vibrator/cs40l25/device.mk +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,raven) $(call soong_config_set,lyric,tuning_product,raven) $(call soong_config_set,google3a_config,target_device,raven) diff --git a/device-slider.mk b/device-slider.mk index a1662de..07834b4 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -29,6 +29,8 @@ include device/google/raviole/audio/slider/audio-tables.mk include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs101/bluetooth/bluetooth.mk +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,slider) $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider) diff --git a/device-whitefin.mk b/device-whitefin.mk index df3ce52..41f5da2 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -29,6 +29,8 @@ include hardware/google/pixel/vibrator/drv2624/device.mk include device/google/raviole/audio/whitefin/audio-tables.mk include device/google/gs101/bluetooth/bluetooth.mk +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,slider) $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider) From 7d8dbf7e825e0d9ce2ac2ca5a992378a67c1a111 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Mon, 3 Oct 2022 19:28:26 +0000 Subject: [PATCH 57/60] Update oriole SVN to 41 Bug: 250644806 Change-Id: I03fb30e509cb48315f5b5c5f4b22baa12daa541d (cherry picked from commit b82247dd1a538bf97bd9b12ad5c477e29e2d5b02) Merged-In: I03fb30e509cb48315f5b5c5f4b22baa12daa541d --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index a3e81fb..176175b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -171,7 +171,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=40 + ro.vendor.build.svn=41 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 15493e7686c125e6cf954b0b00e02c2c19efb101 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Mon, 3 Oct 2022 19:30:20 +0000 Subject: [PATCH 58/60] Update raven SVN to 41 Bug: 250644806 Change-Id: Ie72a0344a2f7e1adb9ad1452428358669dfad707 (cherry picked from commit 76415ed843d088b553b3f5d0ce56b205e8092aca) Merged-In: Ie72a0344a2f7e1adb9ad1452428358669dfad707 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 63abc9d..19e940b 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -180,7 +180,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=40 + ro.vendor.build.svn=41 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 26c612fc29595313d830e9d7fec084241e80f733 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Fri, 28 Oct 2022 18:35:23 +0000 Subject: [PATCH 59/60] Disable Spatial Audio [ DO NOT MERGE ] Bug: 256169331 Test: sound setings do not show spatial audio option Change-Id: Iddcfb2eee234bbbdb2a3d31dd2ce11fdf763094c (cherry picked from commit 1b4f1da3ca545a100215628cf970c1eddfced142) Merged-In: Iddcfb2eee234bbbdb2a3d31dd2ce11fdf763094c --- device-oriole.mk | 4 ++-- device-raven.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 176175b..c9e69ab 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -243,9 +243,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif -# declare use of spatial audio +# declare use of spatial audio: disabled PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.spatializer_enabled=true + ro.audio.spatializer_enabled=false PRODUCT_PACKAGES += \ libspatialaudio diff --git a/device-raven.mk b/device-raven.mk index 19e940b..c337c13 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -256,9 +256,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif -# declare use of spatial audio +# declare use of spatial audio: disabled PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.spatializer_enabled=true + ro.audio.spatializer_enabled=false PRODUCT_PACKAGES += \ libspatialaudio From df54c528bfe70cf5fca5d55185fa7fe014261daa Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 18 Nov 2022 19:56:55 +0000 Subject: [PATCH 60/60] ravioli VNDK on vendor prebuilt vendor + unstable VNDK dessert release = artificially frozen VNDK VNDK on vendor = :D Bug: 259715332 Change-Id: Ieb8251bd31280cbb293207480fb46e9d2447c8b8 Test: N/A (cherry picked from commit 5c5eda629666d80cd8b751162c455ae90ec0aa76) --- aosp_oriole.mk | 2 ++ aosp_raven.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/aosp_oriole.mk b/aosp_oriole.mk index fea2be8..113f679 100644 --- a/aosp_oriole.mk +++ b/aosp_oriole.mk @@ -22,3 +22,5 @@ PRODUCT_DEVICE := oriole PRODUCT_MODEL := AOSP on Oriole PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google + +PRODUCT_PACKAGES += com.android.vndk.current.on_vendor diff --git a/aosp_raven.mk b/aosp_raven.mk index 0a8f525..079de8a 100644 --- a/aosp_raven.mk +++ b/aosp_raven.mk @@ -22,3 +22,5 @@ PRODUCT_DEVICE := raven PRODUCT_MODEL := AOSP on Raven PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google + +PRODUCT_PACKAGES += com.android.vndk.current.on_vendor