From 20bc3e19291cbde361abb992c891c08ebf25afef Mon Sep 17 00:00:00 2001 From: Ziyi Cui Date: Wed, 10 May 2023 18:10:43 +0000 Subject: [PATCH 01/35] powerhint: Reduce StaleTimeFactor Reduce StaleTimeFactor for power saving Bug: 269523712 Test: boot and run uibench Change-Id: I106a4a2322a93147205e079c9461619967a33917 Signed-off-by: Ziyi Cui --- powerhint.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerhint.json b/powerhint.json index e9b1906..58edb97 100644 --- a/powerhint.json +++ b/powerhint.json @@ -2050,7 +2050,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "UiHighBoostWithoutPid", From 3e74bb58d88a861ddcdb4a59edb615c63ba1e280 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 15 Sep 2022 13:18:35 +0800 Subject: [PATCH 02/35] powerhint: remove the duplicate thermal powerhint settings For the current design, thermalHAL will only enable one hint base on the current severity and disable the previous one. As a result, the power hint of higher severity should maintain the actions from lower severity which cause the larger config size and maintenance effort. The new thermalHAL design will keep the lower severity's hint enabled, so we could remove the duplicate policies from higher level. Bug: 241737737 Test: verified T6pro with emul_temp Change-Id: I82d84e1e085b1a22284aa913606b40f219583210 --- powerhint.json | 312 ------------------------------------------------- 1 file changed, 312 deletions(-) diff --git a/powerhint.json b/powerhint.json index 535c70e..bcd1730 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1608,72 +1608,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "TpuControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatThreads", @@ -1686,186 +1620,12 @@ "Duration": 0, "Value": "0,1,2,3" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "TpuControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "Dex2oatThreads", - "Duration": 0, - "Value": "4" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "Dex2oatCPUSet", - "Duration": 0, - "Value": "0,1,2,3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "TpuControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatThreads", "Duration": 0, "Value": "2" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "Dex2oatCPUSet", - "Duration": 0, - "Value": "0,1,2,3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_LITTLE_TSKIN_BYPASS", @@ -1884,84 +1644,12 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "TpuControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatThreads", "Duration": 0, "Value": "1" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "Dex2oatCPUSet", - "Duration": 0, - "Value": "0,1,2,3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", From a135ce6a40012783edaa579c5da412eeebd4c4c6 Mon Sep 17 00:00:00 2001 From: Chungkai Mei Date: Thu, 25 May 2023 03:59:46 +0000 Subject: [PATCH 03/35] disable vendor idle balancer Camera is highly optimized in launched devices, so that we disable idle balancer to avoid influencing previous optimization. Bug: 281489720 Change-Id: I210f5c14ec589b06e8d8e80799cf7cb650baa9c5 Signed-off-by: Chungkai Mei --- powerhint.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/powerhint.json b/powerhint.json index 535c70e..b51153b 100644 --- a/powerhint.json +++ b/powerhint.json @@ -292,6 +292,14 @@ ], "ResetOnInit": true }, + { + "Name": "NewlyIdleBalancer", + "Path": "/proc/vendor_sched/idle_balancer", + "Values": [ + "0", + "1" + ], + }, { "Name": "DisplayWakeup", "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup", @@ -1061,6 +1069,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1133,6 +1147,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1229,6 +1249,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -1289,6 +1315,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", From b0448596b94df18bb5f74372a50810c97ced9195 Mon Sep 17 00:00:00 2001 From: Hsiu-Chang Chen Date: Tue, 27 Jun 2023 12:03:30 +0800 Subject: [PATCH 04/35] wifi: convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable Bug: 287607876 Test: SAR scenario is set properly with motion sensor status Change-Id: Ifef875e019f89bc3e70b2f37006b409dc6ad904e --- wifi/BoardConfig-wifi.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index 0aaffe5..89896ad 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -32,3 +32,6 @@ WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true PRODUCT_COPY_FILES += \ device/google/tangorpro/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ device/google/tangorpro/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf + +# Add WIFI_FEATURE_IMU_DETECTION to soong_config +$(call soong_config_set,wifi,feature_imu_detection,$(WIFI_FEATURE_IMU_DETECTION)) From edce5a7940f48b20a6a9f967e68444f1bbc2e015 Mon Sep 17 00:00:00 2001 From: kuanyuhuang Date: Mon, 28 Nov 2022 15:04:01 +0000 Subject: [PATCH 05/35] Add audio Spatializer and support OPUS codec Add spatializer, immersive playback and OPUS codec at audio config. Enable Spatializer and Bluetooth OPUS codec. Bug: 261660037 Test: play dynamic spatial audio content Change-Id: I8b25eacdd804017a882b26cab13be69d403b6dc9 --- audio/tangorpro/config/audio_effects.xml | 2 ++ .../config/audio_platform_configuration.xml | 6 ++++++ .../config/audio_policy_configuration.xml | 20 +++++++++++-------- ...cy_configuration_a2dp_offload_disabled.xml | 8 ++++++-- audio/tangorpro/config/mixer_paths.xml | 9 ++++++--- bluetooth/syna_default.mk | 2 +- device-tangorpro.mk | 16 +++++++++++++++ 7 files changed, 49 insertions(+), 14 deletions(-) diff --git a/audio/tangorpro/config/audio_effects.xml b/audio/tangorpro/config/audio_effects.xml index 9c2ba29..11e66e5 100644 --- a/audio/tangorpro/config/audio_effects.xml +++ b/audio/tangorpro/config/audio_effects.xml @@ -10,6 +10,7 @@ + @@ -54,6 +55,7 @@ + diff --git a/audio/tangorpro/config/audio_platform_configuration.xml b/audio/tangorpro/config/audio_platform_configuration.xml index f8fb665..76c4136 100644 --- a/audio/tangorpro/config/audio_platform_configuration.xml +++ b/audio/tangorpro/config/audio_platform_configuration.xml @@ -187,6 +187,8 @@ + + @@ -223,6 +225,10 @@ + + + + diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml index 78c8ea3..65c3907 100644 --- a/audio/tangorpro/config/audio_policy_configuration.xml +++ b/audio/tangorpro/config/audio_policy_configuration.xml @@ -58,6 +58,10 @@ + + + + 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"> @@ -193,17 +197,17 @@ + sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out,immersive_out"/> + sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out,immersive_out"/> + sources="primary output,deep buffer,compressed_offload,voip_rx,raw,mmap_no_irq_out,immersive_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + @@ -177,6 +178,7 @@ + @@ -188,6 +190,7 @@ + @@ -516,15 +519,15 @@ - + - + - + diff --git a/bluetooth/syna_default.mk b/bluetooth/syna_default.mk index 72a3015..a7bb878 100644 --- a/bluetooth/syna_default.mk +++ b/bluetooth/syna_default.mk @@ -55,7 +55,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.bluetooth.a2dp_offload.supported=true \ persist.bluetooth.a2dp_offload.disabled=false \ - persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac + persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.firmware.selection="BTFW.hcd" diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 0c526e7..e294354 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -104,6 +104,22 @@ PRODUCT_SOONG_NAMESPACES += device/google/tangorpro/powerstats # Bluetooth HAL and Pixel extension include device/google/tangorpro/bluetooth/syna_default.mk +# Spatial Audio +PRODUCT_PACKAGES += \ + libspatialaudio + +# optimize spatializer effect +PRODUCT_PROPERTY_OVERRIDES += \ + audio.spatializer.effect.util_clamp_min=300 + +# declare use of spatial audio +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.spatializer_enabled=true + +# Bluetooth OPUS codec +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.opus.enabled=true + # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service From c04cea2acea48193ab65e1e990d178706de29b28 Mon Sep 17 00:00:00 2001 From: Mike McTernan Date: Mon, 3 Jul 2023 11:20:27 +0100 Subject: [PATCH 06/35] tangorpro: revert "set metadata_init_delete_all_keys to false" Reverts ag/18876019 now that the underlying problem is fixed. Additionally setting this property can cause devices to fill up with keys and Cts tests to start failing. Bug: 262212842 Test: boot & factory reset on device Change-Id: Ieb5e0f68557c3f888a46275387c71e4f15181dfa --- device-tangorpro.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 0c526e7..b352574 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -148,9 +148,6 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.wifi.sap.interface=wlan1 -# Set ro.crypto.metadata_init_delete_all_keys.enabled to false to unblock boot -PRODUCT_PROPERTY_OVERRIDES += ro.crypto.metadata_init_delete_all_keys.enabled=false - # Assistant minimum volume PRODUCT_PROPERTY_OVERRIDES += \ ro.config.assistant_vol_min=1 From 0d465cac83258e1e74ffa89a12d7c6377cbe5beb Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Thu, 29 Jun 2023 06:47:51 +0000 Subject: [PATCH 07/35] aidl: tangorpro: add audio table for aidl hal Test: end-to-end testing Bug: 289328594 Change-Id: If71b70057dd80136bc49df516c4d9bd5d9ed16e7 --- .../audio_platform_configuration_aidl.xml | 76 ++ .../aidl_config/audio_policy_volumes.xml | 227 ++++ .../aidl_config/mixer_paths_aidl.xml | 1077 +++++++++++++++++ audio/tangorpro/audio-tables.mk | 10 + 4 files changed, 1390 insertions(+) create mode 100644 audio/tangorpro/aidl_config/audio_platform_configuration_aidl.xml create mode 100644 audio/tangorpro/aidl_config/audio_policy_volumes.xml create mode 100644 audio/tangorpro/aidl_config/mixer_paths_aidl.xml diff --git a/audio/tangorpro/aidl_config/audio_platform_configuration_aidl.xml b/audio/tangorpro/aidl_config/audio_platform_configuration_aidl.xml new file mode 100644 index 0000000..912b4aa --- /dev/null +++ b/audio/tangorpro/aidl_config/audio_platform_configuration_aidl.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/tangorpro/aidl_config/audio_policy_volumes.xml b/audio/tangorpro/aidl_config/audio_policy_volumes.xml new file mode 100644 index 0000000..dfba47a --- /dev/null +++ b/audio/tangorpro/aidl_config/audio_policy_volumes.xml @@ -0,0 +1,227 @@ + + + + + + + 0,-4200 + 33,-2800 + 66,-1400 + 100,0 + + + 0,-2400 + 33,-1600 + 66,-800 + 100,0 + + + 0,-2400 + 33,-1600 + 66,-800 + 100,0 + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-4700 + 33,-3500 + 66,-2350 + 100,-1250 + + + + + + + 1,-3350 + 33,-2100 + 66,-1000 + 100,0 + + + + + + + + + + + + 0,-4800 + 33,-2050 + 66,-800 + 100,0 + + + + + + + 1,-3800 + 33,-2600 + 66,-1400 + 100,0 + + + + + + 0,-4200 + 33,-2800 + 66,-1400 + 100,0 + + + 0,-2400 + 33,-1600 + 66,-800 + 100,0 + + + 0,-4200 + 33,-2800 + 66,-1400 + 100,0 + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-4700 + 33,-3500 + 66,-2350 + 100,-1250 + + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-5500 + 33,-3650 + 66,-2700 + 100,-1800 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml new file mode 100644 index 0000000..fa145a5 --- /dev/null +++ b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml @@ -0,0 +1,1077 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/tangorpro/audio-tables.mk b/audio/tangorpro/audio-tables.mk index 0debff0..3ea0940 100644 --- a/audio/tangorpro/audio-tables.mk +++ b/audio/tangorpro/audio-tables.mk @@ -16,6 +16,15 @@ AUDIO_TABLE_FOLDER := tangorpro +# Enable this to build AIDL +BUILD_AUDIO_AIDL_VERSION := false + +ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) +PRODUCT_COPY_FILES += \ + device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \ + device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml +else # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \ device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ @@ -34,6 +43,7 @@ PRODUCT_COPY_FILES += \ # Mixer Path Configuration for AudioHAL PRODUCT_COPY_FILES += \ device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml +endif # Speaker firmware files SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw From ea86b8db9b4100a7bfe076afff6aa3963c04f5be Mon Sep 17 00:00:00 2001 From: Maryam Dehaini Date: Thu, 6 Jul 2023 14:09:34 -0700 Subject: [PATCH 08/35] Reduce status bar height Reduce status bar height to 36dp for the tangorpro devices. Bug: 287482975 Test: Manual testing Change-Id: I4e88b46293576b5bfae11642800516c39c4392cb --- .../overlay/frameworks/base/core/res/res/values/config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml index f38e22f..08296c2 100644 --- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml +++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml @@ -348,8 +348,8 @@ true - 104px - 104px + 36dp + 36dp From 9b158db9f3eab807a642f2c2d52a020a0ec69b85 Mon Sep 17 00:00:00 2001 From: Renato Grottesi Date: Thu, 13 Jul 2023 18:49:28 +0000 Subject: [PATCH 09/35] Remove settings for old ArmNN HIDL backend Compile ArmNN shim over the support library. Remove SELinux permissions and settings for the old HIDL backend. The AIDL settings will be in the gs-common folder. Test: Local run of CtsNNAPITestCases Test: Local run of VtsHalNeuralnetworksTargetTest Test: Local run of MLTS Benchmark Bug: 283724775 Change-Id: Ia1e2a76763e4d0b483513ee84ff124b404647107 --- manifest.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/manifest.xml b/manifest.xml index 8ece978..a427ac0 100644 --- a/manifest.xml +++ b/manifest.xml @@ -98,16 +98,6 @@ hwbinder @1.2::IBootControl/default - - android.hardware.neuralnetworks - hwbinder - 1.2 - - IDevice - armnn - - @1.2::IDevice/armnn - android.hardware.neuralnetworks hwbinder From cb039ba50208e943fdc9bd722ef6457073e3db84 Mon Sep 17 00:00:00 2001 From: Gaurav Sarode Date: Thu, 13 Jul 2023 17:12:26 -0700 Subject: [PATCH 10/35] Fix tangorpro_car build file path bug: 291147977 Test: local build Change-Id: I54c9e4d7523ce2d6f9faf50fdc126163e9547593 --- tangorpro/BoardConfig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk index 0aca763..a38dff3 100644 --- a/tangorpro/BoardConfig.mk +++ b/tangorpro/BoardConfig.mk @@ -23,7 +23,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 ifdef PHONE_CAR_BOARD_PRODUCT - include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk + include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else TARGET_SCREEN_DENSITY := 320 endif From b8a4dae74000473b2b102c3f17ec80e6cb9d00fc Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Fri, 14 Jul 2023 06:54:16 +0000 Subject: [PATCH 11/35] aidl: sthal: add support for aec record in mixer table note: This table is only used by AIDL Sthal. Bug: 291186942 Test: end-to-end enable path by quick phrase. Change-Id: I01242fbddb04961cdf6a4bab50ce733e4ab64ae0 --- .../aidl_config/mixer_paths_aidl.xml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml index fa145a5..fb119d5 100644 --- a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml +++ b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml @@ -896,6 +896,17 @@ + + + + + + + + + + + @@ -939,17 +950,6 @@ - - - - - - - - - - - From 2ea4191313e01296dbc2891f9063e1fedf7ab464 Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Wed, 28 Jun 2023 11:15:21 +0800 Subject: [PATCH 12/35] uwb: update uwb calibration for T6P - ant_delay ch5 ant_delay : from 16430 to 16460 ch9 ant_delay : from 16416 to 16445 - update channel restrction Bug: 287082706 Bug: 289062178 Test: build pass Change-Id: I37b01320787301e77ff18889d6352c1ce22bbb93 Signed-off-by: Rex Lin --- uwb/UWB-calibration-ce.conf | 32 +++--- uwb/UWB-calibration-fcc.conf | 32 +++--- uwb/UWB-calibration-jp.conf | 32 +++--- uwb/UWB-calibration-restricted.conf | 148 ++++++++++++++++++++++++++++ uwb/UWB-calibration.conf | 32 +++--- uwb/uwb_calibration.mk | 2 +- uwb/uwb_country.conf | 18 ++++ 7 files changed, 231 insertions(+), 65 deletions(-) create mode 100644 uwb/UWB-calibration-restricted.conf diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index 0002568..8024b12 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -12,76 +12,76 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16430 +ant0.ch5.prf16.ant_delay=16460 ant0.ch5.prf16.tx_power=0x4f4f444f ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16430 +ant0.ch5.prf64.ant_delay=16460 ant0.ch5.prf64.tx_power=0x4f4f444f ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 -ant0.ch9.prf16.ant_delay=16416 +ant0.ch9.prf16.ant_delay=16445 ant0.ch9.prf16.tx_power=0x3e3e303e ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16416 +ant0.ch9.prf64.ant_delay=16445 ant0.ch9.prf64.tx_power=0x3e3e303e 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=16430 +ant1.ch5.prf16.ant_delay=16460 ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 ant1.ch5.prf16.pg_delay=0 -ant1.ch5.prf64.ant_delay=16430 +ant1.ch5.prf64.ant_delay=16460 ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0 -ant1.ch9.prf16.ant_delay=16416 +ant1.ch9.prf16.ant_delay=16445 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16416 +ant1.ch9.prf64.ant_delay=16445 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=16430 +ant2.ch5.prf16.ant_delay=16460 ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 ant2.ch5.prf16.pg_delay=0 -ant2.ch5.prf64.ant_delay=16430 +ant2.ch5.prf64.ant_delay=16460 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16416 +ant2.ch9.prf16.ant_delay=16445 ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0 -ant2.ch9.prf64.ant_delay=16416 +ant2.ch9.prf64.ant_delay=16445 ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16430 +ant3.ch5.prf16.ant_delay=16460 ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 ant3.ch5.prf16.pg_delay=0 -ant3.ch5.prf64.ant_delay=16430 +ant3.ch5.prf64.ant_delay=16460 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16416 +ant3.ch9.prf16.ant_delay=16445 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16416 +ant3.ch9.prf64.ant_delay=16445 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 4e7d2de..8325fe7 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -12,76 +12,76 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16430 +ant0.ch5.prf16.ant_delay=16460 ant0.ch5.prf16.tx_power=0x4f4f444f ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x28 -ant0.ch5.prf64.ant_delay=16430 +ant0.ch5.prf64.ant_delay=16460 ant0.ch5.prf64.tx_power=0x4f4f444f ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x28 -ant0.ch9.prf16.ant_delay=16416 +ant0.ch9.prf16.ant_delay=16445 ant0.ch9.prf16.tx_power=0x5e5e4c5e ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x28 -ant0.ch9.prf64.ant_delay=16416 +ant0.ch9.prf64.ant_delay=16445 ant0.ch9.prf64.tx_power=0x5e5e4c5e ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x28 ant0.port=0 ant0.selector_gpio=7 ant0.selector_gpio_value=0 -ant1.ch5.prf16.ant_delay=16430 +ant1.ch5.prf16.ant_delay=16460 ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 ant1.ch5.prf16.pg_delay=0 -ant1.ch5.prf64.ant_delay=16430 +ant1.ch5.prf64.ant_delay=16460 ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0 -ant1.ch9.prf16.ant_delay=16416 +ant1.ch9.prf16.ant_delay=16445 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16416 +ant1.ch9.prf64.ant_delay=16445 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=16430 +ant2.ch5.prf16.ant_delay=16460 ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 ant2.ch5.prf16.pg_delay=0 -ant2.ch5.prf64.ant_delay=16430 +ant2.ch5.prf64.ant_delay=16460 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16416 +ant2.ch9.prf16.ant_delay=16445 ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0 -ant2.ch9.prf64.ant_delay=16416 +ant2.ch9.prf64.ant_delay=16445 ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16430 +ant3.ch5.prf16.ant_delay=16460 ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 ant3.ch5.prf16.pg_delay=0 -ant3.ch5.prf64.ant_delay=16430 +ant3.ch5.prf64.ant_delay=16460 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16416 +ant3.ch9.prf16.ant_delay=16445 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16416 +ant3.ch9.prf64.ant_delay=16445 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 417f7f8..00201cd 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -12,76 +12,76 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16430 +ant0.ch5.prf16.ant_delay=16460 ant0.ch5.prf16.tx_power=0xffffffff ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16430 +ant0.ch5.prf64.ant_delay=16460 ant0.ch5.prf64.tx_power=0xffffffff ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 -ant0.ch9.prf16.ant_delay=16416 +ant0.ch9.prf16.ant_delay=16445 ant0.ch9.prf16.tx_power=0x2e2e242e ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16416 +ant0.ch9.prf64.ant_delay=16445 ant0.ch9.prf64.tx_power=0x2e2e242e 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=16430 +ant1.ch5.prf16.ant_delay=16460 ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 ant1.ch5.prf16.pg_delay=0 -ant1.ch5.prf64.ant_delay=16430 +ant1.ch5.prf64.ant_delay=16460 ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0 -ant1.ch9.prf16.ant_delay=16416 +ant1.ch9.prf16.ant_delay=16445 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16416 +ant1.ch9.prf64.ant_delay=16445 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=16430 +ant2.ch5.prf16.ant_delay=16460 ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 ant2.ch5.prf16.pg_delay=0 -ant2.ch5.prf64.ant_delay=16430 +ant2.ch5.prf64.ant_delay=16460 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16416 +ant2.ch9.prf16.ant_delay=16445 ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0 -ant2.ch9.prf64.ant_delay=16416 +ant2.ch9.prf64.ant_delay=16445 ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16430 +ant3.ch5.prf16.ant_delay=16460 ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 ant3.ch5.prf16.pg_delay=0 -ant3.ch5.prf64.ant_delay=16430 +ant3.ch5.prf64.ant_delay=16460 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16416 +ant3.ch9.prf16.ant_delay=16445 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16416 +ant3.ch9.prf64.ant_delay=16445 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf new file mode 100644 index 0000000..1c98823 --- /dev/null +++ b/uwb/UWB-calibration-restricted.conf @@ -0,0 +1,148 @@ +[CCC]version=3 +[CCC]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant2 +[CCC]alternate_pulse_shape=0x00 +ant0.ch5.prf16.ant_delay=16449 +ant0.ch5.prf16.tx_power=0xFFFFD4FF +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x28 +ant0.ch5.prf64.ant_delay=16449 +ant0.ch5.prf64.tx_power=0xFFFFD4FF +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x28 +ant0.ch9.prf16.ant_delay=16451 +ant0.ch9.prf16.tx_power=0xFEFEC0FE +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x28 +ant0.ch9.prf64.ant_delay=16451 +ant0.ch9.prf64.tx_power=0xFEFEC0FE +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x28 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16450 +ant1.ch5.prf16.tx_power=0xFFFFFFFF +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x26 +ant1.ch5.prf64.ant_delay=16450 +ant1.ch5.prf64.tx_power=0xFFFFFFFF +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x26 +ant1.ch9.prf16.ant_delay=16451 +ant1.ch9.prf16.tx_power=0x3E3E303E +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0x16 +ant1.ch9.prf64.ant_delay=16451 +ant1.ch9.prf64.tx_power=0x3E3E303E +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0x16 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16450 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16450 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16451 +ant2.ch9.prf16.tx_power=0x8E8E748E +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x28 +ant2.ch9.prf64.ant_delay=16451 +ant2.ch9.prf64.tx_power=0x8E8E748E +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x28 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16450 +ant3.ch5.prf16.tx_power=0 +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16450 +ant3.ch5.prf64.tx_power=0 +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16450 +ant3.ch9.prf16.tx_power=0 +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0 +ant3.ch9.prf64.ant_delay=16450 +ant3.ch9.prf64.tx_power=0 +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0 +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=2421 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=0 +ant1.ant3.ch9.pdoa_offset=-6159 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant2.ch5.pdoa_lut=0a:f4:77:0a:d9:f4:c5:09:c1:f5:12:09:df:f5:60:08:7f:f6:ac:07:dd:f6:fa:06:f2:f6:48:06:89:f7:96:05:d1:f7:e3:04:54:f8:2f:04:f0:f8:7d:03:46:fa:cb:02:b0:fb:19:02:23:fd:64:01:a2:fe:b2:00:00:00:00:00:31:01:4e:ff:a6:02:9c:fe:0a:04:e7:fd:52:05:35:fd:73:06:83:fc:cb:07:d1:fb:be:08:1d:fb:f8:09:6a:fa:39:0b:b8:f9:81:0c:06:f9:1b:0d:54:f8:87:0d:a0:f7:a0:0e:ee:f6:06:0f:3b:f6:2d:0f:89:f5 +ant1.ant2.ch9.pdoa_lut=d7:f1:85:f5:66:f2:3d:f6:b8:f2:f6:f6:48:f3:9a:f7:9a:f3:52:f8:00:f4:0a:f9:a4:f4:ae:f9:85:f5:66:fa:b8:f6:1f:fb:ec:f7:d7:fb:ae:f9:7b:fc:33:fb:33:fd:e1:fc:ec:fd:29:fe:a4:fe:e1:fe:48:ff:d7:ff:00:00:b8:00:b8:00:d7:01:5c:01:5c:03:14:02:1f:05:cd:02:52:06:85:03:d7:07:29:04:0a:09:e1:04:3d:0a:9a:05:33:0b:52:06:29:0c:f6:06:c3:0d:ae:07:5c:0f:66:08:1f:11:0a:09:66:12:c3:09:00:14:7b:0a +ant1.ant3.ch5.pdoa_lut=89:f4:ac:07:a2:f4:60:08:ae:f4:77:0a:0a:f5:12:09:7d:f5:c5:09:8d:f5:fa:06:0a:f7:48:06:9a:f7:96:05:fa:f7:e3:04:68:f8:2f:04:f0:f9:7d:03:fa:fb:cb:02:6d:fd:19:02:2f:fe:64:01:98:fe:b2:00:00:00:00:00:1d:02:4e:ff:2d:02:e7:fd:33:02:9c:fe:0a:03:35:fd:6f:04:83:fc:db:05:d1:fb:85:07:1d:fb:b0:08:6a:fa:06:09:b8:f9:71:09:06:f9:48:0a:54:f8:4e:0b:a0:f7:58:0c:3b:f6:62:0c:ee:f6:c5:0c:89:f5 +ant1.ant3.ch9.pdoa_lut=3d:f2:85:f5:52:f2:3d:f6:cd:f2:f6:f6:e1:f2:9a:f7:0a:f3:52:f8:1f:f3:0a:f9:33:f3:ae:f9:71:f3:66:fa:52:f4:1f:fb:85:f5:d7:fb:9a:f7:7b:fc:0a:f9:33:fd:29:fa:ec:fd:ae:fb:a4:fe:ec:fd:48:ff:1f:ff:00:00:cd:00:b8:00:0a:03:5c:01:8f:04:14:02:b8:06:cd:02:66:08:85:03:3d:0a:29:04:7b:0c:e1:04:0a:0d:9a:05:29:0e:52:06:8f:0e:f6:06:a4:0e:ae:07:b8:0e:66:08:cd:0e:0a:09:33:0f:c3:09:c3:0f:7b:0a +xtal_trim=23 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +alternate_pulse_shape=0x00 +restricted_channels=0xFFFF +[HAL]aoa_restricted_channels=0x20 +[HAL]aoa_capability=2 +[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=3 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4 +[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=4 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8 +[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3 +[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3 +[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4 +[HAL]ant_sets.ch5.azimuth_elevation.tx_ant_set_nonranging=0 +[HAL]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging=0 +[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3 +[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3 +[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8 +[HAL]minimum_system_offset_uwbtime0=250 +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.conf index 4e7d2de..8325fe7 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -12,76 +12,76 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16430 +ant0.ch5.prf16.ant_delay=16460 ant0.ch5.prf16.tx_power=0x4f4f444f ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x28 -ant0.ch5.prf64.ant_delay=16430 +ant0.ch5.prf64.ant_delay=16460 ant0.ch5.prf64.tx_power=0x4f4f444f ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x28 -ant0.ch9.prf16.ant_delay=16416 +ant0.ch9.prf16.ant_delay=16445 ant0.ch9.prf16.tx_power=0x5e5e4c5e ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x28 -ant0.ch9.prf64.ant_delay=16416 +ant0.ch9.prf64.ant_delay=16445 ant0.ch9.prf64.tx_power=0x5e5e4c5e ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x28 ant0.port=0 ant0.selector_gpio=7 ant0.selector_gpio_value=0 -ant1.ch5.prf16.ant_delay=16430 +ant1.ch5.prf16.ant_delay=16460 ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 ant1.ch5.prf16.pg_delay=0 -ant1.ch5.prf64.ant_delay=16430 +ant1.ch5.prf64.ant_delay=16460 ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0 -ant1.ch9.prf16.ant_delay=16416 +ant1.ch9.prf16.ant_delay=16445 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16416 +ant1.ch9.prf64.ant_delay=16445 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=16430 +ant2.ch5.prf16.ant_delay=16460 ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 ant2.ch5.prf16.pg_delay=0 -ant2.ch5.prf64.ant_delay=16430 +ant2.ch5.prf64.ant_delay=16460 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16416 +ant2.ch9.prf16.ant_delay=16445 ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0 -ant2.ch9.prf64.ant_delay=16416 +ant2.ch9.prf64.ant_delay=16445 ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16430 +ant3.ch5.prf16.ant_delay=16460 ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 ant3.ch5.prf16.pg_delay=0 -ant3.ch5.prf64.ant_delay=16430 +ant3.ch5.prf64.ant_delay=16460 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16416 +ant3.ch9.prf16.ant_delay=16445 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16416 +ant3.ch9.prf64.ant_delay=16445 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index c7075bf..4a00743 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -20,7 +20,7 @@ LOCAL_UWB_CAL_DIR=device/google/tangorpro/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-restricted.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 \ diff --git a/uwb/uwb_country.conf b/uwb/uwb_country.conf index 7ba69f2..92e7ecc 100644 --- a/uwb/uwb_country.conf +++ b/uwb/uwb_country.conf @@ -16,3 +16,21 @@ *JP "Japan": "jp" + +*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 fb55fbb7ecc5ce3552ed28154708ca1d04f8f061 Mon Sep 17 00:00:00 2001 From: Philip Quinn Date: Wed, 12 Jul 2023 15:11:37 -0700 Subject: [PATCH 13/35] Update motion prediction offset. The Jetpack motionprediction library calculates a prediction target based on the minimum display refresh rate (16~18 ms). UX feedback suggests that we should cap this at 3~4 stylus frames, which therefore requires a -4 ms offset (1 frame). Clients of the framework MotionPredictor can control the prediction time directly and can access predictions further into the future by providing a larger value. Bug: 288354672 Test: predictions are visible in the motionprediction test app Change-Id: I3a489b59b8b2050c64dd31b2a0f75c2238cb432d --- .../overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml index 08296c2..15b02f6 100644 --- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml +++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml @@ -636,7 +636,7 @@ true - 20000000 + -4000000 false From dcf54dff3a829e4eff4d9698766ea4cf6cf5a435 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Wed, 28 Jun 2023 10:31:27 +0800 Subject: [PATCH 14/35] audio: Enable multiple USB Audio support Bug: 289334178 Test: verified USB Audio on test build Change-Id: I4675165a62f6779b33511c1a3f4e55cdfe7dd9cf Signed-off-by: Carter Hsu --- audio/tangorpro/config/audio_policy_configuration.xml | 2 +- .../audio_policy_configuration_a2dp_offload_disabled.xml | 2 +- device-tangorpro.mk | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml index 65c3907..4c35125 100644 --- a/audio/tangorpro/config/audio_policy_configuration.xml +++ b/audio/tangorpro/config/audio_policy_configuration.xml @@ -205,7 +205,7 @@ + sources="primary output,deep buffer,compressed_offload,mmap_no_irq_out,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,mmap_no_irq_out,voip_rx"/> Date: Tue, 18 Jul 2023 20:57:41 -0700 Subject: [PATCH 15/35] tangorpro: Add userdebug init.rc Bug: 290944591 Signed-off-by: Pat Tjin Change-Id: I582d74bf2d753a86a9b329ef52982cb99056f375 --- conf/init.tangorpro.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc index afcbf90..95f92ef 100644 --- a/conf/init.tangorpro.rc +++ b/conf/init.tangorpro.rc @@ -1,6 +1,9 @@ # Tangorpro specific init.rc import /vendor/etc/init/hw/init.gs201.rc +on init && property:ro.build.flavor=tangorpro-userdebug + import /vendor/etc/init/hw/init.tangorpro.userdebug.rc + on init && property:ro.vendor.factory=1 import /vendor/etc/init/hw/init.factory.rc From 0932277fe07f43657ad8fe5b3ea74a3bad2a2827 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Mon, 19 Jun 2023 19:47:57 +0800 Subject: [PATCH 16/35] audio: enable apmg3 feature Bug: 292144567 Test: verified on test build Change-Id: I7898494cfe8b52b901d4d61de7a17234cc8a579a Signed-off-by: Carter Hsu --- .../config/audio_platform_configuration.xml | 13 +++++++++++-- audio/tangorpro/config/mixer_paths.xml | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/audio/tangorpro/config/audio_platform_configuration.xml b/audio/tangorpro/config/audio_platform_configuration.xml index 76c4136..77f6f53 100644 --- a/audio/tangorpro/config/audio_platform_configuration.xml +++ b/audio/tangorpro/config/audio_platform_configuration.xml @@ -199,7 +199,7 @@ - + @@ -245,10 +245,15 @@ + + + + + @@ -301,9 +306,13 @@ - + + + + + diff --git a/audio/tangorpro/config/mixer_paths.xml b/audio/tangorpro/config/mixer_paths.xml index 4d5fc66..44cf0ea 100644 --- a/audio/tangorpro/config/mixer_paths.xml +++ b/audio/tangorpro/config/mixer_paths.xml @@ -610,14 +610,17 @@ + + + From ae2f6b61c9e0c5aebbab3482b5b31471ce2984fb Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Wed, 5 Jul 2023 16:04:44 +0800 Subject: [PATCH 17/35] audio: add speech enhancer Bug: 292144567 Test: VoIP call on test build Change-Id: I15de87813180ba6e879907cd0c6cdc0a7822f1d6 Signed-off-by: Carter Hsu --- device-tangorpro.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 29de848..931c6c7 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -281,6 +281,14 @@ PRODUCT_PACKAGES += \ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := device/google/tangorpro/device_framework_matrix_product_tangorpro.xml +#Audio +PRODUCT_PROPERTY_OVERRIDES += \ + persist.vendor.audio.speech_enhancement.enable=1 + +PRODUCT_PACKAGES += \ + libspeechenhancer \ + audio_speech_enhancer_aoc + PRODUCT_COPY_FILES += \ device/google/tangorpro/public.libraries-google-tangorpro.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/public.libraries-google.txt From 846117a2348b560b99c5d79dd6dd09b2a7758e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Gr=C3=B6nroos?= Date: Tue, 20 Jun 2023 18:35:58 +0200 Subject: [PATCH 18/35] Install APMg3 external module and tuning configs. Bug: 292144567 Test: Manual test on Tangor with Meet call. Change-Id: I1516875745b6ad3696eb5c179866646af0ea5981 --- audio/tangorpro/audio-tables.mk | 8 +++++++- .../config/audio_platform_configuration.xml | 1 + .../tuning/apmg3/downlink_dock_config.pb | Bin 0 -> 340 bytes .../tuning/apmg3/downlink_headset_config.pb | Bin 0 -> 340 bytes .../apmg3/downlink_tablet_stereo_config.pb | Bin 0 -> 340 bytes .../tangorpro/tuning/apmg3/uplink_dock_config.pb | Bin 0 -> 2074 bytes .../tuning/apmg3/uplink_headset_config.pb | Bin 0 -> 2069 bytes .../tuning/apmg3/uplink_tablet_stereo_config.pb | Bin 0 -> 3746 bytes device-tangorpro.mk | 4 ++++ 9 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 audio/tangorpro/tuning/apmg3/downlink_dock_config.pb create mode 100644 audio/tangorpro/tuning/apmg3/downlink_headset_config.pb create mode 100644 audio/tangorpro/tuning/apmg3/downlink_tablet_stereo_config.pb create mode 100644 audio/tangorpro/tuning/apmg3/uplink_dock_config.pb create mode 100644 audio/tangorpro/tuning/apmg3/uplink_headset_config.pb create mode 100644 audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb diff --git a/audio/tangorpro/audio-tables.mk b/audio/tangorpro/audio-tables.mk index 3ea0940..da4490b 100644 --- a/audio/tangorpro/audio-tables.mk +++ b/audio/tangorpro/audio-tables.mk @@ -61,7 +61,13 @@ PRODUCT_COPY_FILES += \ device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.dat \ device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/mcps.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/mcps.dat \ device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \ - device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps + device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps \ + device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_headset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_headset_config.pb \ + device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_dock_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_dock_config.pb \ + device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/uplink_tablet_stereo_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/uplink_tablet_stereo_config.pb \ + device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_headset_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_headset_config.pb \ + device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_dock_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_dock_config.pb \ + device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/tuning/apmg3/downlink_tablet_stereo_config.pb:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/downlink_tablet_stereo_config.pb # userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/audio/tangorpro/config/audio_platform_configuration.xml b/audio/tangorpro/config/audio_platform_configuration.xml index 76c4136..fea8544 100644 --- a/audio/tangorpro/config/audio_platform_configuration.xml +++ b/audio/tangorpro/config/audio_platform_configuration.xml @@ -286,6 +286,7 @@ + diff --git a/audio/tangorpro/tuning/apmg3/downlink_dock_config.pb b/audio/tangorpro/tuning/apmg3/downlink_dock_config.pb new file mode 100644 index 0000000000000000000000000000000000000000..2e98cf57a6320763843229af8956f4b811294302 GIT binary patch literal 340 zcmd;D!Nk$uyiMnR_M|DDK_Q7qhq5ZQq`>1Ch4#RPNd?AX29>`pf`5=2h_JQmL*$;9D$UPu; zf!qgjC&;}ZcZ1vy@(0L2Ab)}U2l6M#zaW2u{0|BTP{9L4T{&&1z^Rc20BduSivR!s literal 0 HcmV?d00001 diff --git a/audio/tangorpro/tuning/apmg3/downlink_headset_config.pb b/audio/tangorpro/tuning/apmg3/downlink_headset_config.pb new file mode 100644 index 0000000000000000000000000000000000000000..b4622087fdc642fa4f5abce5e681b5930c4abafb GIT binary patch literal 340 zcmd;D!Nk$Bg-ffm2CN}SiQsCbG^Y*-5 zRW=<~J;hyCwyoy7mqs7hy<*jcU2i%$ZC3mZvq`qvXKnFs{_e%Pb9al>&a{4Y{IvC) zvgf-)jT-jM`qpgu!+*QYTJxjUmx5FFzP);UugM~ly^+S7Y|nKV+1)C7XWK2QxK}Zf zVc$Xl#=QqB)a-n(Y1o5k5FaECk_V{+sR!u;=?9quG7n@f$b67JAp1b}g6s#m1LPi% zyFl&(xfASOpu0it2l)f!ACSL5{sZ|F4qOf2l4{FrFBI`X+414Dzo0+U8M07u25LI3~& literal 0 HcmV?d00001 diff --git a/audio/tangorpro/tuning/apmg3/downlink_tablet_stereo_config.pb b/audio/tangorpro/tuning/apmg3/downlink_tablet_stereo_config.pb new file mode 100644 index 0000000000000000000000000000000000000000..8328669b685ba52a71737e4fd201543595ac03a3 GIT binary patch literal 340 zcmd;D!Nk$Bg-ffm2CN}SiQsCbG^Y*-5 zRW=<~J;hyCwyoy7mqs7hy<*jcU2i%$ZC3mZvq`qvXKnFs{_e%Pb9al>&a{4Y{IvC) zvgf-)jT-jM`qpgu!+*QYTJxjUmx5FFzP);UugM~ly^+S7Y|nKV+1)C7XWK2QxK}Zf zVc$Xl#=QqB)a-n(Y1o5k5FaECk_V{+sR!u;=?9quG7n@f$b67JAp1b}g6s#m1LPi% zyFl&(xfASOpu0it2l)f!ACSL5{sZ|F4qOf2l4{FrFBI`X+414Dzo0+U8607t{3KmY&$ literal 0 HcmV?d00001 diff --git a/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb b/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb new file mode 100644 index 0000000000000000000000000000000000000000..fbdeaf546f46a2557f61f51d883e9442155c712e GIT binary patch literal 2074 zcmeH|O=uHQ5XWbdZ2P(amBNeINgM`)1z!_NmWM zRYmo?FN`sisQCoMI|W1ms#fBlK)0b^HSakIML_rmrhEc3LSPtTATg&4(E3Cm4Dp^2 z`;gvtVwmh*dzY0^iI5M({Ibiyg6A|YaV|wp3dsTD{Q^b+)@>7D%Ne5)=RB=oUj&%g zNYG{$=vk&md)%pZifs&wm`@v}RRb|aN(0k#=J4>aHO8j2*_h5(0zwH#W?>#L!SVqT zq7L=|eRbuR4pb52H`RV|II4a;dP?7HG)#BPL$m{Xq}=^&QVWVmloqsf?$JIYo|J=3 zveT|K!P3RWMNevMBSj?b>^9mkfn}VB%N**iNqqK&nz^dlIz?|Kxl6%d7Hup6JS^^; zwj4-@Qu1e0wMf!5Wt_!SZ^%vai_;fg>7Q24S`yqGLngr!MXv1vXV-H=9drSL#wq~-aEgF61v{AzA^V6ML;{Q zc89oHsCb@wb*8ls>{LKL&T1}V-kC+?V3GRk%uACiG4Bp|>eX5wN8?W`S;g*{>Th|~ zy?A8V=t={H;h%_9Vgj`Q0gG|hy0u2JR;^iB;2>RS-OtsF?&K0vs}RIIXBcU}$&G8z zUmrWMKoHU9fZ>NFm6O3O1LBW8m2qI6=gFD9-c>T-?3=&uGLbrFv^~7YRS8ozq1Cn=nK6R&uYf(G8E&Der@Q_F%|wPU<=b6Nb+|XZKhu2Yyf+q_Z@R7MT>KT) z5KoGNC+kTNZ{B+i1tDM}c+s;5FP?f6deNCp3#F%m;3A-#%zKmT}fc^)Iia=io)WHM?E4Bb*N+>#5<2kk=yo^mO zOzwUS9B53C4VY(~Q4ebaqa_E|i)5q{9Kf0uFb~j?A;5mTNGtIj@*wX5EbqA#OpDqU zHRH{QHX;sC7p7t?kk^cJ)E1Hixyd|_Io#~jf_zBi6(5|J=i)&K(s;5(5~CZ zCXgUnPqb-~%TMm!3~VwC3lEH^l@diD=U>n6TsN|$WUn^QD9&tN`~Lo_O@QbG)XkEz z-EI${-T_iZjtr(GEaMt(zV$b069%A`p$i2o zGr}iD_ZlgjxX}OgZK?EjXQw(izlNH7Jl@$`|AHc8T-L^NtjhO$y{gS4V=Om&`&Gyb zVYH0)d{@AtR*}*68ANG|&uhb5E`l;y2q~8{U&-fREPn8n@ literal 0 HcmV?d00001 diff --git a/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb b/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb new file mode 100644 index 0000000000000000000000000000000000000000..2872f039ea8446266502e5b91205987143a1725a GIT binary patch literal 3746 zcmeH|dr(x@9mmfFHe9azlNC9*q8m3$2`fsp%YAHk?4Ap#K$TZCWiVuvD6tqLkQynO zG#H~XqF@vfK@GGujTq5ss-wghsZ$JCF=|>-W5&_SXdLS!HEMLM{hhlKz{Ip^^Jo6p zv*+IPJ-_pNea@BM79>fmxb9~Wtb$z#@e@gSphzeo6<)_+Q7|U9lEf*Mf^o{tvTOhQukIMA5_{FUM_WL=;XDBct-qSY@X1+4~HO?JCe z80$=ojg9q=rU?f$@ z5~h(kXtmGa==Q_lja*eQJiFB!$saKolUrcIBtqJgejM(}fnCRxeD_e{MakVEOUMTJvz1 zk_?yZSLbx#+y@s(?cymbs57O6&UffuoVk{PMY7-D*zUE9A z>z~Lc^ES0bX$1%o9z!_%q)6h);4>!)U;Qn7@^t6@&wS2DK7kI|p6$joO-ziO8?rDC z{YE}lj;#9`@(GkvZ{ttMry2SDT|7pCDEF5lpJpGQT>3SiL%%nkMtLXkJpDNQe>un^ zy?AmmeRv8^!n?K)p1hq&GB)B5kLQ6NJUN-1Mh}8m=Rx2`K2d!aPXk)savTMZf#--t zm0naY^Y*AY$3D9ItL;1*liS3^bmJc4c-nQ0=dx~hInDeY`W|Su^CVPw4Kyu1XxhdG z{TFCDT!<bjM9MoZUD?gR3zs6u7|}Rk(9~w+d`psRGs2 z*EA^trtc|9fS8yn6$0(aDwxa8DX?Skc?DuzYZXY2eo;kp7nj|MgShwuZYXxj=;DqA zGVIb8E3o`>XDoE*waPHJn=VdLrrX?0*?)EQs4_%Cc~_ETNE_c8=Il* zk`iUm#~qVl_mkZ+)Xm!}!-*T~70J~{Y3%tdW{v85_f_I;1tOkWr`#jym$}5iiwbOP zm?A?!8J_;K%dKE3dQUfIueRKljdyf;er=|7)E|#s-?=9qCj7z@2hA&AcEhg}(4gz1 z0u|oL{D}tJO8%fh(XfLm*iSyI!pFyjM=|o3K8i?y9rNFI!vp7*Yf!WGryA^jZJq{~ zOG7lMd~J$~q8q^r?>zOJ%dFBZjA|4+s!=%nDPE$g{Czr z8a!;qf_-xBJ*{8Wdu?W}J|n|~8CDf$1c-{!Q}EGfv);FrZ;D)7+2 zH)L3{S(RbU!L70IR@H#7$yi&Jh8>#}sls2{_Ns96Pt#Sn^|Y$MnSudozusKhVZPhy zJf0r1jM%0gd(+pkzN)HiV`R8;_``20vmw7V{zC;S&rDIF@sTYm{PE}8Vqw0?bH7g7 z^2H_@=mk-Q2__FVZi=A6@s1RqGvDka;|OCIW2XvqMFpvF<(T1EarK=kl z%_ym6blO*CjDBF5%4mf$jM22wW=2grMld?xK`%XYEsW7Q^|_2*A2o~7gQw0h`tS&|PL-A@oi>y_qSN4d yhfW`AD$uFeoT<~Tv6mQaFWkuJ>6NcD`nh!zqn_uR8LeJ4*-Hmb+~;+72>%A@6->?m literal 0 HcmV?d00001 diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 29de848..ebdc52e 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -274,6 +274,10 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.multi_usb_mode=true +# Audio package +PRODUCT_PACKAGES += \ + audio_apmg3_aoc + # AudioProxy PRODUCT_PACKAGES += \ libaudio_proxy.google \ From 04570db34bb7eb74ecfdfdcad4f7a9a0cdc99dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=85hgren?= Date: Thu, 10 Aug 2023 19:17:38 +0000 Subject: [PATCH 19/35] Update APMg3 and tuning configs. This CL updates the APMg3 tunings to version 4. The tunings are available at https://drive.google.com/drive/folders/1wbYVjMkirbOcdV37DIeT5oipXfGrx1YT?usp=drive_link and complexity and memory figures for the tunings are available at https://docs.google.com/spreadsheets/d/1ZtPoIw3SGPKErR8xURvp3gyDvNNl7bISCzLFH_HDOIc/edit?usp=sharing&resourcekey=0-q7s7VtDqDSf762Lvb4d7gA Bug: 292144567 Test: Manual test on Tangor with Meet call. Change-Id: Id2f5cec85a2b5436b15cbe2981c5b272211d10e6 --- .../tuning/apmg3/downlink_dock_config.pb | Bin 340 -> 371 bytes .../tuning/apmg3/downlink_headset_config.pb | Bin 340 -> 72 bytes .../apmg3/downlink_tablet_stereo_config.pb | Bin 340 -> 371 bytes .../tuning/apmg3/uplink_dock_config.pb | Bin 2074 -> 2076 bytes .../tuning/apmg3/uplink_headset_config.pb | Bin 2069 -> 2069 bytes .../apmg3/uplink_tablet_stereo_config.pb | Bin 3746 -> 3748 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/tangorpro/tuning/apmg3/downlink_dock_config.pb b/audio/tangorpro/tuning/apmg3/downlink_dock_config.pb index 2e98cf57a6320763843229af8956f4b811294302..bd2111b3a38492c15c543f1058894ce84afbac6e 100644 GIT binary patch literal 371 zcmd;D!Nk$i+UoR@2m$T4`t+Si~(**{Qv6q4kYjAvQNsD{Q(8gl$Z| z3s{>vui7P?c5C+{SF=4e)!|k~Hs5SGJ3MW-?Ul8SOKGx66I*EI$9-?li+y|cvL2S) z*S>;j--a@gy&hss_8=O>2Z@8^LFz#2LHa=YLFRzW1DOjlA7l^6K9Id2`$6sixd-Gf zko!RH1i2UFZjk#y{s8$0h^z7vyh{|3TpZ3J*}Y2(j`WyL-xBN`Xs`OXl#^ zMjNF^&umVAHM9NkXM(N7D+aqQcByvjuAH`0V&Y)Z;^ANrWdH(M5MhvJ#R=v&*h?@1 E02I=e?*IS* literal 340 zcmd;D!Nk$uyiMnR_M|DDK_Q7qhq5ZQq`>1Ch4#RPNd?AX29>`pf`5=2h_JQmL*$;9D$UPu; zf!qgjC&;}ZcZ1vy@(0L2Ab)}U2l6M#zaW2u{0|BTP{9L4T{&&1z^Rc20BduSivR!s diff --git a/audio/tangorpro/tuning/apmg3/downlink_headset_config.pb b/audio/tangorpro/tuning/apmg3/downlink_headset_config.pb index b4622087fdc642fa4f5abce5e681b5930c4abafb..86eb4bc6728b61bbbf1820007a595e89ed29bea9 100644 GIT binary patch delta 50 zcmcb@{r~^~ literal 340 zcmd;D!Nk$Bg-ffm2CN}SiQsCbG^Y*-5 zRW=<~J;hyCwyoy7mqs7hy<*jcU2i%$ZC3mZvq`qvXKnFs{_e%Pb9al>&a{4Y{IvC) zvgf-)jT-jM`qpgu!+*QYTJxjUmx5FFzP);UugM~ly^+S7Y|nKV+1)C7XWK2QxK}Zf zVc$Xl#=QqB)a-n(Y1o5k5FaECk_V{+sR!u;=?9quG7n@f$b67JAp1b}g6s#m1LPi% zyFl&(xfASOpu0it2l)f!ACSL5{sZ|F4qOf2l4{FrFBI`X+414Dzo0+U8M07u25LI3~& diff --git a/audio/tangorpro/tuning/apmg3/downlink_tablet_stereo_config.pb b/audio/tangorpro/tuning/apmg3/downlink_tablet_stereo_config.pb index 8328669b685ba52a71737e4fd201543595ac03a3..2ea4f92108e5975c9552f876917f067b1232940e 100644 GIT binary patch literal 371 zcmd;D!Nk$^>MOxAXh@HP%eq-&t368d}#a_uS28D84(XrNH`y@d9hX zCkngUY?$`^KfQI=qtd_DMyKU=&r{{tdu+e|-hje6dwdsr+HSnN*EZ{Cqpi(N-#xZX z(R;=DSoS=fz1CLV-Ps;QgZLnEkUU5oNIgg&NI%FNka-|;LFR+(0oez#7i2%k9U%9B z+y!zU$ekefg4_*qKgb^-|A71j@*l{bApe5=4e~!I96;d#3Kt<(Ue9^`_EHL5a$GX% z2MlbF2KU>V6~D0cF|n|F@?)ai>d5DI3=9qSN=zI~T09(#q6`ctoMdOsoM~r}YQ@RH L0OU8=OE3ZeBg-ffm2CN}SiQsCbG^Y*-5 zRW=<~J;hyCwyoy7mqs7hy<*jcU2i%$ZC3mZvq`qvXKnFs{_e%Pb9al>&a{4Y{IvC) zvgf-)jT-jM`qpgu!+*QYTJxjUmx5FFzP);UugM~ly^+S7Y|nKV+1)C7XWK2QxK}Zf zVc$Xl#=QqB)a-n(Y1o5k5FaECk_V{+sR!u;=?9quG7n@f$b67JAp1b}g6s#m1LPi% zyFl&(xfASOpu0it2l)f!ACSL5{sZ|F4qOf2l4{FrFBI`X+414Dzo0+U8607t{3KmY&$ diff --git a/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb b/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb index fbdeaf546f46a2557f61f51d883e9442155c712e..d11ab9739f26d9bc39f198e0df55886ce98624bd 100644 GIT binary patch delta 677 zcmbOwFh^j53Y&xMoFfem6SZU*87I0YNzP~IV(0k9D8M1XB;>-uB)}rUs-U33XuvS> zkV`NF1B1QlUh_6nT_DTBG=TrBrw|W^h^Vn~vAryaCnXK!ojv1YD{E|QY_B?N=1e<; zQY9V^E`(BzUyP;<3<;AX8ExxNIQcR#3>;BEptk!m2x0nt@&+cE$$Oc&CZAzaQ)aMW zFjC@WU}$g_1rqkM3=9g6s%OufvDF0;rXXUnD6?Dr6-EvgAssG$UasrPwvcE5#)X{_ zSinX!!qUV>79=1$YvxURRZwI~fmElZrP)IahN?yt09tnd6qS6)YJ m<`oQ+^;vpZxj`vn@3bzL@gOcmWl33qI21~*g1YN3UEj;3Au1E2(U=7Dkw}&V6mO} zn>+mMnKQPk;@dA;=rS-cIG6_TfAtjN;Sdo$d&b9J7Q~a12J*PBE8EC2Ff`b!f>;Qp zN+6|aX=xCp8owA#85k5CEPgRg{>NfjKh4>ffnnf?`T@1wmq7^A?~^w$$xPnM#5MU0 zlbQ&l1%r_iFECV{MS+A9FnkppCog9Ut-r*`!6Kx?#m@^0Y+%?gwvh!zlMuQ9P{#p# zRiIuwDUfPll-YqyvImMY*aKC+3EW`|iby-K07UhynUeMj3>wS^tQM>eY+lkZT_+&+ zD+Fk8vKcT~FgP$ze!#3dc@;a47^?&$$P#-E4FhId5TkU>QFZglhAh3TyrRa&#*+`T ZsIl^ZlELP8ES5}c3=SaWlXcnO0{}NHpvV9K diff --git a/audio/tangorpro/tuning/apmg3/uplink_headset_config.pb b/audio/tangorpro/tuning/apmg3/uplink_headset_config.pb index ce5fa76b2fcb151a7e8ccfdaeec24bbcae385779..f1552ed64f4d3a7bb1274aec3984f86601c3f024 100644 GIT binary patch delta 103 zcmbO#FjZiJGW!At*<(NB9VTk^GO}*mF^idzb>fZ`R&G&aa5fCwDXNn0$|2P>tD$jicc^lK`_7gl2St(jJTf3=xb;OdO0Brx^iImK-7g delta 72 zcmbO#FjZiJGJAu)Y@uzR<3z1qMuv?$W-)`vZsy7N*ag)Xjo3IEzB36hT0v+gCn)W~ Q7{Cz0n8d`vXmOem01k8$FaQ7m diff --git a/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb b/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb index 2872f039ea8446266502e5b91205987143a1725a..4d07b2acafd03c3f13ce58e09a5ae63c3e88a7b6 100644 GIT binary patch delta 256 zcmZ1^yF_+^BFDq3E%vf8{caOA8yM$LT=j&Jd2>Hw1tZ_tGiPjdL4+xYm@LZdR)2+& zgGES(i=X#R;0{|+kg)98Gd^}g{JdP(m2E^LEKO{{0d;B?^flI8`O4AgbPNtS^@!BHVV zgPX&E!Ggho(L-c%ExYz)UKSn+4GC7DH4XL}HU`YLAV%q$qw3}r43qU)dRe(ejg5;Z aA7oL3ur|M8v1DQc+GK3Jd9yZqIXeJaAWggg delta 239 zcmZ1?yGV9|A_oIQgS~8_ZQn%A2FAG)S3O~5-Q3Su!8myZTS)ySMh+Gs9WH*}hgDPT zL}$&MX(xO3%o$rDe%?2MJ8VTkY_NdrteH3MRT&r}e)6&xHMZxBRgn+711!Nf* z4%n;Cnki|oz@Wiwz-qzaz~d#&3pC9RsOy9iP+q}NAwYwZ!+^np!GY0(YjQoi_GDfb z9x)pUMxZqf_8K+@%(fs#>6)YJ=93LsdRcizjg5^bA7)Ww Date: Tue, 13 Jun 2023 11:31:37 +0800 Subject: [PATCH 20/35] audio: spatial audio on spk - Enable EP4 (dev1 = 3) - Change Stereo Spatialier component id to 26 - Enable spatial audio on speaker - Add one more parameter for waves custom action. (OM=1, SM=3) Bug: 295577176 Test: manual test Change-Id: I7e14776b34571eed5a632a7b5769d1ea784fa8ee Signed-off-by: Jasmine Cha --- .../config/audio_platform_configuration.xml | 5 +++-- .../config/audio_policy_configuration.xml | 2 +- audio/tangorpro/config/mixer_paths.xml | 6 ++--- audio/tangorpro/tuning/waves/waves_config.ini | 21 ++++++++++-------- audio/tangorpro/tuning/waves/waves_preset.mps | Bin 44398 -> 71008 bytes device-tangorpro.mk | 3 ++- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/audio/tangorpro/config/audio_platform_configuration.xml b/audio/tangorpro/config/audio_platform_configuration.xml index fea8544..a8afc4c 100644 --- a/audio/tangorpro/config/audio_platform_configuration.xml +++ b/audio/tangorpro/config/audio_platform_configuration.xml @@ -188,7 +188,7 @@ - + @@ -288,6 +288,7 @@ + @@ -300,7 +301,7 @@ - + diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml index 4c35125..15c529b 100644 --- a/audio/tangorpro/config/audio_policy_configuration.xml +++ b/audio/tangorpro/config/audio_policy_configuration.xml @@ -193,7 +193,7 @@ + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output,immersive_out"/> - + - + - + diff --git a/audio/tangorpro/tuning/waves/waves_config.ini b/audio/tangorpro/tuning/waves/waves_config.ini index 21b7a19..61f1cc4 100644 --- a/audio/tangorpro/tuning/waves/waves_config.ini +++ b/audio/tangorpro/tuning/waves/waves_config.ini @@ -30,6 +30,7 @@ SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_MUSIC = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_CALL = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_MUSIC_2_1 = OM:6,SM:2 +SPEAKER_RESERVED_MUSIC = OM:1,SM:3,OST:OST_SPEAKER DOCKSPEAKER_MUSIC = OM:4,SM:2 DOCKSPEAKER_VOICE_MUSIC = OM:7,SM:2 @@ -39,7 +40,7 @@ DOCKSPEAKER_VOICE_MUSIC = OM:7,SM:2 # This can be configured by Waves or platform vendor. ######################################################################################################## [HAL_SUPPORTED_CONTROLS] -SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL|SPEAKER_MUSIC_2_1 +SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL|SPEAKER_MUSIC_2_1|SPEAKER_RESERVED_MUSIC DOCKSPEAKER_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:DOCKSPEAKER_MUSIC|DOCKSPEAKER_VOICE_MUSIC [COEFS_CONVERTER_SETTING] @@ -54,14 +55,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatIncrement=8 [CUSTOM_ACTION_259] -CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC -CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0|1,PRESET:SPEAKER_SAFE_CALL -CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0|1,PRESET:SPEAKER_SAFE_MUSIC -CASE_4=PRIORITY:3,NUMBERS:4096|16384|67108864:0|1|4:0|1,PRESET:DOCKSPEAKER_MUSIC -CASE_5=PRIORITY:4,NUMBERS:2:0|1:1,PRESET:SPEAKER_MUSIC_2_1 -CASE_6=PRIORITY:5,NUMBERS:4096|16384|67108864:2|3:0|1,PRESET:DOCKSPEAKER_VOICE_MUSIC +CASE_1=PRIORITY:0,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0|1:0|1,PRESET:SPEAKER_SAFE_CALL +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0|1:0|1,PRESET:SPEAKER_SAFE_MUSIC +CASE_4=PRIORITY:3,NUMBERS:4096|16384|67108864:0|1|4:0|1:0|1,PRESET:DOCKSPEAKER_MUSIC +CASE_5=PRIORITY:4,NUMBERS:2:0|1:1:0|1,PRESET:SPEAKER_MUSIC_2_1 +CASE_6=PRIORITY:5,NUMBERS:4096|16384|67108864:2|3:0|1:0|1,PRESET:DOCKSPEAKER_VOICE_MUSIC +CASE_7=PRIORITY:6,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_RESERVED_MUSIC -# Action 259 parameters: audio_devices_t, audio_mode_t, is_dock_speaker_active_t +# Action 259 parameters: audio_devices_t, audio_mode_t, is_dock_speaker_active_t, is_spatial_audio_active_t # - audio_devices_t : current active device # - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip -# - is_dock_speaker_active_t: 0 - Disabled, 1 - Enabled \ No newline at end of file +# - is_dock_speaker_active_t: 0 - Disabled, 1 - Enabled +# - is_spatial_audio_active_t: 0 - Disabled, 1 - Enabled diff --git a/audio/tangorpro/tuning/waves/waves_preset.mps b/audio/tangorpro/tuning/waves/waves_preset.mps index 36d7de5a16e7d6296efd7747f920aa6492dcddb4..50e9600853ea99ed82db1f161df3c689cf5ef339 100644 GIT binary patch delta 1858 zcmeH{&rcIU6vt=Ux~&xoBw&c46z~UX5Gw=(1$IRY7$~i=8X<*Ep{OLKG=M!25+JEi z6GI@6n;5+qp+$)9g~Wrz8%a5EBgP*bkc-A}GTv~eGrMi|Utp3>zHdG=+qdt#Z+?B! z?L-arjjn5sdwCe;A%w7zOh~Uo_!vSKs>#?OKi%Ql&y+Mpn8hA&=^ip8FQDqE)7Rk<*AmmhM&x0nq^mos6uw^+q( z)9N$Bu)1u6=#m+_d~OX#LR>19eNLOOZN}T?p+r(#(xjM7Pl{uj6qht9E@@IsrYFTQ zO^V6%q*NRUWieTWuntp4U@MZFL4-*)McIwKEHZi)v1ic|hRra2vu=UKV2RFf)C5wG z4L(K-dF+FmQ#KG{4LqKQ=OiwVW=YSfmbRq47GAS5->V6E`+k6UYd;*BKP7r}MvG(HRG3>D{tuO&wk z<*&EX;C^EK7M)45FDltL_HZtJ6NC&>D2e{SxbP@*eS)qW92|Uz$9Dl6143dade@SJ zaXAEM^WlZbg3FW@)3`tiqFl^sv_R)8ixRKj(w8ipB(=&$sEZhkQBIpT;2ZAs2K!`Q zHH4rHj~~_zDbC@I3{tm;%EW}uAULhqX`M`TD3`QDnN01_t|M%t*fYo#?N5G$_9v66 z{aL~{()MIDwLR~sG!iOh^cl6Vh+0UU&vp$CjSPAFM-CnQ_sdUraBLor&3{ff$R%}< z$y5hD0>|`@<&t{HCH0WWR1b?)Oig4s)kL?3$sNluxnuR(9eaWpsok;2g|%Q`{0pT0 B27>?q delta 518 zcmaE`isjucCUvI(N8hxy3=EcB6qBkj1PL zVixahrVx^vTac4jlByq)T3n*w8xX9Zt6*ecWTb0osB2`Hv4(+xg>ADDfeiFPn%VqzJLc{i~Q#{Acs2V>q%@`EuAlfz)l-ekDw!(_M#u_<*h1rJkTqMKt= z{pH!t&u2V8-v(?mlnJsK$^_XAWrA#mi2`kgGC?*&nIM~?Opwh`Cdg)(XiAw9gsH*6 z$ixT?ClF>};Po%cOwB7vEXmBzi#OaX-MK)4Ek2JiKCg4~!IgFF5ayK0_Y&nNr>@F_ z@?9qXZ+{Fp;~+<3x1TJT)9>as2rpQ0NFpY-T(jq diff --git a/device-tangorpro.mk b/device-tangorpro.mk index bec0315..57dd148 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -114,7 +114,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ # declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.spatializer_enabled=true + ro.audio.spatializer_enabled=true \ + persist.vendor.audio.spatializer.speaker_enabled=true # Bluetooth OPUS codec PRODUCT_PRODUCT_PROPERTIES += \ From f7afe8e6e3ec7ec8afec4a6588fafa7a6688b6c5 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Wed, 23 Aug 2023 13:25:27 +0800 Subject: [PATCH 21/35] audio: set spatial tranaural enabled default property Bug: 295577176 Test: toggle transarual on system ui Change-Id: I889370ae63882e94f4a11c87842b2df8af2f30d3 Signed-off-by: Jasmine Cha --- device-tangorpro.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 57dd148..12c2dd8 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -115,6 +115,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true \ + ro.audio.spatializer_transaural_enabled_default=false \ persist.vendor.audio.spatializer.speaker_enabled=true # Bluetooth OPUS codec From 7662732086435a9ee1e667b9285abcdaf0843a54 Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Thu, 17 Aug 2023 07:24:21 +0000 Subject: [PATCH 22/35] [USB Audio AIDL] Add mixer_paths for usb audio. Test: Local Test Bug: 274870625 Change-Id: Iaee8eef36164ec126eda0d205115b26ae9305160 --- .../aidl_config/mixer_paths_aidl.xml | 179 ++++++++++++++---- 1 file changed, 143 insertions(+), 36 deletions(-) diff --git a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml index fb119d5..b166614 100644 --- a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml +++ b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml @@ -407,12 +407,20 @@ - + - - + + + + + + + + + + @@ -435,12 +443,16 @@ - + - - + + + + + + @@ -463,12 +475,20 @@ - + - - + + + + + + + + + + @@ -496,12 +516,20 @@ - + - - + + + + + + + + + + @@ -524,20 +552,32 @@ - + - - + + - + + + + + + + + + - - + + + + + + @@ -560,12 +600,20 @@ - + - - + + + + + + + + + + @@ -588,12 +636,16 @@ - + - - + + + + + + @@ -618,14 +670,21 @@ - + - - - + + + + + + + + + + @@ -637,10 +696,18 @@ - + + + + + + + + + @@ -649,10 +716,18 @@ - + + + + + + + + + @@ -665,10 +740,18 @@ - + + + + + + + + + @@ -695,12 +778,20 @@ - + + + + + + + + + - + @@ -715,10 +806,18 @@ - + + + + + + + + + @@ -771,10 +870,18 @@ - + + + + + + + + + @@ -987,7 +1094,7 @@ - + From 72f8c55ee170743f53c13dd070dd45ed8a7715c1 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Fri, 25 Aug 2023 07:43:25 +0000 Subject: [PATCH 23/35] Revert "audio: set spatial tranaural enabled default property" This reverts commit f7afe8e6e3ec7ec8afec4a6588fafa7a6688b6c5. Reason for revert: enabled by default since previous issue is fixed. Bug: 295577176 Test: manual test Change-Id: I5ba77e916934004e55d91ad74f2af38d42a2f704 --- device-tangorpro.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 12c2dd8..57dd148 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -115,7 +115,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true \ - ro.audio.spatializer_transaural_enabled_default=false \ persist.vendor.audio.spatializer.speaker_enabled=true # Bluetooth OPUS codec From 3718ded7473b72df2536ad15bdd9c8207de95d59 Mon Sep 17 00:00:00 2001 From: shihchienc Date: Fri, 11 Aug 2023 08:56:58 +0000 Subject: [PATCH 24/35] BQR: Enable LE Audio Choppy Event Report Set the Bit 6 to true to enable the LE Audio Choppy Event Report Bug: 222596864 Tag: #feature Test: Verified the LE Audio Choppy Event will be reported + Regression test b/297331166 Change-Id: I15bbea2dd109f0cdd03a1a115e6870a7a118a7e3 --- bluetooth/syna_default.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/bluetooth/syna_default.mk b/bluetooth/syna_default.mk index a7bb878..d7e99de 100644 --- a/bluetooth/syna_default.mk +++ b/bluetooth/syna_default.mk @@ -15,6 +15,15 @@ # limitations under the License. # +# Override BQR mask to enable LE Audio Choppy report +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.bqr.event_mask=262238 +else +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.bqr.event_mask=94 +endif + # Bluetooth Super Wide Band PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.hfp.swb.supported=true From b8b40df7a8cb47685468dc35fd94dc75d91dc43e Mon Sep 17 00:00:00 2001 From: Yung Ti Su Date: Mon, 28 Aug 2023 02:14:06 +0000 Subject: [PATCH 25/35] [AIDL] Add mixer paths for BT Bug: 293221641 Test: manual Change-Id: Iedf51795a3330d89982bd7b573eee617541a44b2 Signed-off-by: Yung Ti Su --- .../aidl_config/mixer_paths_aidl.xml | 222 +++++++++++++++++- 1 file changed, 217 insertions(+), 5 deletions(-) diff --git a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml index b166614..5baadf9 100644 --- a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml +++ b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml @@ -407,6 +407,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -443,6 +471,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -475,6 +531,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -516,6 +600,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -552,6 +664,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -600,6 +740,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -636,6 +804,22 @@ + + + + + + + + + + + + + + + + @@ -670,6 +854,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -728,7 +940,7 @@ - + @@ -752,7 +964,7 @@ - + @@ -818,7 +1030,7 @@ - + @@ -882,7 +1094,7 @@ - + @@ -1084,7 +1296,7 @@ - + From 11ea16adff32833c1ef3d1ea3eccbad58e862a32 Mon Sep 17 00:00:00 2001 From: Yung Ti Su Date: Fri, 1 Sep 2023 02:30:52 +0000 Subject: [PATCH 26/35] add mixer path for BT SCO voice call Bug: 297794937 Test: manual Change-Id: I6901afda339a85d1ce1892dcca823ae4829bde74 Signed-off-by: Yung Ti Su --- audio/tangorpro/aidl_config/mixer_paths_aidl.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml index 5baadf9..bb50217 100644 --- a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml +++ b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml @@ -990,6 +990,18 @@ + + + + + + + + + + + + From 733cea1ebd6393a55606d9995b8d14f4bd1b14ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=85hgren?= Date: Tue, 5 Sep 2023 17:12:59 +0000 Subject: [PATCH 27/35] Update APMg3 and tuning configs to version 6 This CL updates the APMg3 tunings to version 6 (previous version was version 4, and version 5 was skipped). The tunings are available at https://drive.google.com/drive/folders/12x0vnEtbDcFyqCKkT7iJISYhOcKmMN2R?usp=sharing. Complexity and memory figures are basically the same as for https://docs.google.com/spreadsheets/d/1ZtPoIw3SGPKErR8xURvp3gyDvNNl7bISCzLFH_HDOIc/edit?usp=sharing&resourcekey=0-q7s7VtDqDSf762Lvb4d7gA Bug: 292144567 Test: Manual test calls on Tangor using Meet, together with TAP-points recordings for verification, as well as lab benchmarking in the STO audio lab. Change-Id: I26fe9b8ce430e8cb2143d7b6e0d5e1c80b2c2556 --- .../tuning/apmg3/uplink_dock_config.pb | Bin 2076 -> 2142 bytes .../apmg3/uplink_tablet_stereo_config.pb | Bin 3748 -> 2897 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb b/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb index d11ab9739f26d9bc39f198e0df55886ce98624bd..eb71d231b15c6cb29afa20b18f7e43971ba367a7 100644 GIT binary patch delta 284 zcmbOua8F=@8q2Ji-i{Nst}EmVHCxG^J#)rZb+37wsV)NpgM(=R|5r~T9u8hnV`JmV zii~QkJfdl7X_I{zy(XKpPMo}jv1#&3rfx>Y$=BGF)ovY%y28l8BBaB`&%38Y*hZA= zy0Q(>L?1gLeqNC2q7QT@SWT{Dc93B*;IQCy;PR5@)r{%46=h&J;Uo*R&p|;>gJbe7 z=0e6 zLl()&PuWeJjqErYzB36hNttm;^4h(qv=_B|@pHc{h^2bx`p^Bk=f4-*1EoCm`0Yh? Y75n$gf>^3ywg2|(-uJJyw>ZTJ0GAC`ssI20 delta 218 zcmca7Fh^j58q1s`4Gt5vt}Ad|SGJL5U|_IU-D}=vstaT}mF0}2k6P-0v(jJFu28ILnsvvm<1`TEdRts(i9xrKLpn#ny1H%a? zSq6p&4hq}>8f*p(77Pw-9s-l=*|jJ0vhYZ7OE9T|oS`9SAYu#joPFt&obCWXI9)ok@U6%8W~r*X~87y{O%b vpZjG&EY&;Lf9}^k|Gn5ADCMcgZ!fB=*uP&E#8M5b{kLEDzJIN~#Ysj0wz7Ii delta 1233 zcmah{e@v8R9DkqtLC4E|yt;VL6FWV*jyp8shwt+|FLH25Bw2&*%I3 ze!kD=d)C$F*_mcuv18G$^b4szNgVKnJc1yE{nIg(;z_w@BXRN!_$GSCiLsFM(ddnT z(1Oqv_V3#}BkUD|)-0QnSST);i8!-fb-GBO#k{*ceB%`bFHmp{oQg8MAGw#KWBrF5t7rBzcrUGGICGKYiaw~Pd?6g&_@07<%iB2` zk7RQk-?D+@+OtlMZCfgt4!Z8B&BMt4!yLO^EgZp@S28?4yh4U=>D@9O?o-!NaTfHi z5zzdLn_~8*;|yPH?&kP@?$Zofy@l!WjQ2@L=JFJZu4p>L_T8Nv=ZapUSW_m*SZ!;i zV#ef}bzd!`IHRuTXlXp44_CXBBi;XlDx-LCl#0R0c%xgvpIHo56`wLJJ>Nue`p3Gd zkfzof3=~9(Qtf7_w%DkO&-j$2hK6skis4-m4E+*{XOq_As*Kh5y zvs>4j1P04vLvP8qp1`^@WsICV_8(Ro@QFpoD7Fn(GPK@*h#~f9$9!zG7EInIRbM;< zf9ThC8PXLSLy5IOU*BTFaj~cPZ#Dm3C!@wVGQASTKp>G}WXMkc*Uq~h=%O&Yexi8t h=c`OiNxp5Ss)2Nh>no=-sqQzeBG!}mATcXF Date: Thu, 7 Sep 2023 08:43:53 +0000 Subject: [PATCH 28/35] Disable 32k dual mic support on T6Pro project Based on the phase 2 strategy, disable dual mic support on T6Pro project Bug: 299387423 Test: Ensure 32k dual mic config will not be selected Change-Id: I5f639061965e5b71e3ffda7150dc9017bbf86b3b --- bluetooth/syna_default.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bluetooth/syna_default.mk b/bluetooth/syna_default.mk index d7e99de..bce1d49 100644 --- a/bluetooth/syna_default.mk +++ b/bluetooth/syna_default.mk @@ -24,6 +24,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.bqr.event_mask=94 endif +# Not support LE Audio dual mic SWB call based on the current launch strategy +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.leaudio.dual_bidirection_swb.supported=false + # Bluetooth Super Wide Band PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.hfp.swb.supported=true From 28c488ab7045b4063c9bf4069410d5212cab6d3f Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Sun, 10 Sep 2023 15:55:34 +0000 Subject: [PATCH 29/35] [USB Audio AIDL] Fix wrong capture path on mixer_paths.xml Bug: 299388175 Test: Local Test Change-Id: I5579d020463086b3492563db728f4721381d5b7f --- audio/tangorpro/aidl_config/mixer_paths_aidl.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml index bb50217..2d051b8 100644 --- a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml +++ b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml @@ -913,7 +913,7 @@ - + From 79357a1d08d87a8b73d6491e79db4d85a233186b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=85hgren?= Date: Tue, 12 Sep 2023 13:14:46 +0000 Subject: [PATCH 30/35] Update APMg3 and tuning configs to version 7 This CL updates the APMg3 tunings to version 7. The changes performed is to remove any signal level gains applied in APMg3 in AOC for the headset usecase. This eliminates the issue of APMg3 applying 25 dB gain when headsets are used causing some headset audio signals to be saturated. The tunings are available at https://drive.google.com/drive/folders/1TICEDO_vHlpWR8My91kxJrWTpGNqIStE?usp=sharing. Complexity and memory figures are basically the same (slightly lower) as for https://docs.google.com/spreadsheets/d/1ZtPoIw3SGPKErR8xURvp3gyDvNNl7bISCzLFH_HDOIc/edit?usp=sharing&resourcekey=0-q7s7VtDqDSf762Lvb4d7gA Bug: 300147435 Test: Manual test calls on Tangor using Meet. Change-Id: Ib06e05cbaa0e632deb9a4961a98d0ce9737121fb --- .../tuning/apmg3/uplink_headset_config.pb | Bin 2069 -> 2069 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/tangorpro/tuning/apmg3/uplink_headset_config.pb b/audio/tangorpro/tuning/apmg3/uplink_headset_config.pb index f1552ed64f4d3a7bb1274aec3984f86601c3f024..b2c4aa61a3d8323778026dd9dcd1dd9cbfe67c09 100644 GIT binary patch delta 12 TcmbO#FjZiJJR`$Kg|F-Y7>)zT delta 12 TcmbO#FjZiJJR{>qg|F-Y7?T6Z From 9ceef720f1a5b291da20deb220e82e52c8769029 Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Mon, 18 Sep 2023 03:31:43 +0800 Subject: [PATCH 31/35] Config T6pro as LE audio hidden by default Based on the lunch stratgey, hide LE audio toggle for T6pro (Phase 1) for now Bug: 300807171 Test: LE audio toggle isn't shown on Device Detail by default Change-Id: Id29ae19cdf527df368fd94ba5cac7897d420e650 --- bluetooth/syna_default.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bluetooth/syna_default.mk b/bluetooth/syna_default.mk index bce1d49..5f25bb3 100644 --- a/bluetooth/syna_default.mk +++ b/bluetooth/syna_default.mk @@ -42,6 +42,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.ccp.server.enabled?=true \ bluetooth.profile.vcp.controller.enabled?=true \ +# LE Audio Lunch Config for Phase 1 (LE audio toggle hidden by default) +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.toggle_visible=false + # Bluetooth HAL and Pixel extension DEVICE_MANIFEST_FILE += \ device/google/tangorpro/bluetooth/manifest_bluetooth.xml From d46e9305211f005351b975823c14de3cf81d63fb Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 19 Sep 2023 03:00:46 +0000 Subject: [PATCH 32/35] Disable limiting camera_hal for LAUNCH hint If auto rotation is enabled, it will trigger LAUNCH hint while camera is running if device rotates, which could limit camera_hal tasks to little cores. So, disable it first until there is a new hint for the rotation event. Bug: 297273578 Test: build pass Change-Id: I104bdf8952da66346ecf73ed02245b8bc4be3ee8 --- powerhint.json | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/powerhint.json b/powerhint.json index 95fcd73..5ba5566 100644 --- a/powerhint.json +++ b/powerhint.json @@ -698,30 +698,6 @@ "Type": "DoHint", "Value": "LAUNCH_PMU" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "LAUNCH", "Type": "DoHint", From 1bb9b6b916bc0851e186524971463135646ad89a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=85hgren?= Date: Tue, 19 Sep 2023 20:39:13 +0000 Subject: [PATCH 33/35] Update APMg3 and tuning configs to version 8 This CL updates the APMg3 tunings to version 8. The changes performed is to remove a high-pass filter that replicated what the 3P provider did. Removing this high-pass filter improves the clarity of the near-end speech while having negligible impact on the rest of the processing. The tunings are available at https://drive.google.com/drive/folders/1_8KdDcCLUb_ycSY3IMgO3Af11a8McU0S?usp=sharing Complexity and memory figures are basically the same (slightly lower) as for https://docs.google.com/spreadsheets/d/1ZtPoIw3SGPKErR8xURvp3gyDvNNl7bISCzLFH_HDOIc/edit?usp=sharing&resourcekey=0-q7s7VtDqDSf762Lvb4d7gA Bug: 301140272 Test: Manual test calls on Tangor using Meet. Lab testing in audio labs with ACQUA/Headacoustics test suites. Change-Id: I02a604cb88086c160996cd7e46d7f10f876e68eb --- .../tuning/apmg3/uplink_dock_config.pb | Bin 2142 -> 2078 bytes .../apmg3/uplink_tablet_stereo_config.pb | Bin 2897 -> 2833 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb b/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb index eb71d231b15c6cb29afa20b18f7e43971ba367a7..999c0424fc78b1b2fb5f58176cd0d25e4e1d6c1d 100644 GIT binary patch delta 11 Scmca7Fi&8EGzYWADMkPoCIfZ= delta 75 zcmbOya8F=^G>5a19Y@1=CIKcXGcHM9yBC%AqINHS?w19zRPS8>xnKAE_hNgXl&2oQ ay{N8Y|9)8zOEs+a-+tZu{ Date: Thu, 28 Sep 2023 06:46:07 +0000 Subject: [PATCH 34/35] [SWB] Disable super wideband Disable SWB by setting system property Tag: #feature Bug: 302436444 Test: flash devices and check property Change-Id: I5065ff4d6f05efe8c7d8c4aa85ebc8f11d07c44d --- bluetooth/syna_default.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bluetooth/syna_default.mk b/bluetooth/syna_default.mk index 5f25bb3..53a04b1 100644 --- a/bluetooth/syna_default.mk +++ b/bluetooth/syna_default.mk @@ -30,7 +30,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth Super Wide Band PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.hfp.swb.supported=true + bluetooth.hfp.swb.supported=false # Bluetooth LE Audio PRODUCT_PRODUCT_PROPERTIES += \ From 84beed357e9a0c851150204e0bd8e8e43925dd56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=85hgren?= Date: Thu, 28 Sep 2023 09:37:58 +0000 Subject: [PATCH 35/35] Update APMg3 and tuning configs to version 9 This CL updates the APMg3 tunings to version 9. The changes performed is to reduce the post-AEC gain to the level that was in the v4 tunings (a 7 dB reduction), as the gain in v8 has been shown to sometimes saturate the nearend. The tunings are available at https://drive.google.com/drive/folders/11dKj-dpkNUlcci8kTsxi3lN5Ht5FEzXu?usp=drive_link Complexity and memory figures are basically the same (slightly lower) as for https://docs.google.com/spreadsheets/d/1ZtPoIw3SGPKErR8xURvp3gyDvNNl7bISCzLFH_HDOIc/edit?usp=sharing&resourcekey=0-q7s7VtDqDSf762Lvb4d7gA Bug: 302471415 Test: Manual test calls on Tangor using Meet. Lab testing in TPE labs with ACQUA/Headacoustics. Offline testing on recordings. Change-Id: I12309ab01772724cda9da6bb793586bf0d79715e --- .../tuning/apmg3/uplink_dock_config.pb | Bin 2078 -> 2078 bytes .../apmg3/uplink_tablet_stereo_config.pb | Bin 2833 -> 2833 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb b/audio/tangorpro/tuning/apmg3/uplink_dock_config.pb index 999c0424fc78b1b2fb5f58176cd0d25e4e1d6c1d..7996795fe7ce0c9c8dca52c4ca3b55a5d30dfe4a 100644 GIT binary patch delta 15 XcmbOyFi&8D8q1s`4GtT%zOVxTE_4PB delta 15 XcmbOyFi&8D8q2Ji-i{l!zOVxTEB*zn diff --git a/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb b/audio/tangorpro/tuning/apmg3/uplink_tablet_stereo_config.pb index 7788a74e48062a12f1ddeb6a8130fd0d85b0cbb2..4c8a821bb6edac1518f3bcd12768b0af17eebde9 100644 GIT binary patch delta 14 VcmbOzHc@PX8gop)+eXb7TmU3H1qA>A delta 14 VcmbOzHc@PX8grrTy^WeLxBw;E1z-RG