From a238e8f826f89022cdfdc55e91c0a78a85664414 Mon Sep 17 00:00:00 2001 From: linpeter Date: Tue, 4 Oct 2022 17:37:08 +0800 Subject: [PATCH 1/7] Update IDisplay to V7 Bug: 241969007 Change-Id: Ic1ca88d809cef36056c3560ce1fa5b3c96a78d6d --- device_framework_matrix_product_felix.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product_felix.xml b/device_framework_matrix_product_felix.xml index 30414c5..d6e5a71 100644 --- a/device_framework_matrix_product_felix.xml +++ b/device_framework_matrix_product_felix.xml @@ -1,7 +1,7 @@ com.google.hardware.pixel.display - 6 + 7 IDisplay secondary From 5837e427b0ad55397380c0dbf890bdbba8d63fed Mon Sep 17 00:00:00 2001 From: Speth Chang Date: Thu, 6 Oct 2022 16:46:36 +0800 Subject: [PATCH 2/7] f10: bypass csi crc error Bug: 249439125 Test: F10 outer front GCA Change-Id: I41ec5bb93d01863b975f6390e0e60ed7d5465781 --- device-felix.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index ed62cdd..7cd8243 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -271,4 +271,5 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Camera PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.camera.extended_launch_boost=1 \ - persist.vendor.camera.raise_buf_allocation_priority=1 + persist.vendor.camera.raise_buf_allocation_priority=1 \ + persist.vendor.camera.debug.bypass_csi_link_crc_error=true From d328c82ab7b4f5fb4d5c22853ddced40e3e95c67 Mon Sep 17 00:00:00 2001 From: Weizhung Ding Date: Tue, 4 Oct 2022 15:38:08 +0800 Subject: [PATCH 3/7] Enabel smooth display Bug: 234327332 Test: entry/exit idle and AoD Change-Id: Icebb3e85ff23631b051d11a359c44a7efe28cdad --- felix/overlay/frameworks/base/core/res/res/values/config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/felix/overlay/frameworks/base/core/res/res/values/config.xml b/felix/overlay/frameworks/base/core/res/res/values/config.xml index d0839d4..10f430f 100644 --- a/felix/overlay/frameworks/base/core/res/res/values/config.xml +++ b/felix/overlay/frameworks/base/core/res/res/values/config.xml @@ -42,7 +42,7 @@ 0 - 90 + 120 @@ -208,7 +208,7 @@ - 90 + 120 From ce6c56f576ce7225ee741e507900e650af19c97d Mon Sep 17 00:00:00 2001 From: eddielan Date: Wed, 12 Oct 2022 17:33:07 +0800 Subject: [PATCH 4/7] fingerprint: Set power_key node Bug: 253179270 Test: Build pass, check power_key log on device Change-Id: I3b7f73ca9a5955ea58d2610889cf2cff03df49aa --- fingerprint_config.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/fingerprint_config.mk b/fingerprint_config.mk index fd21645..5870c87 100644 --- a/fingerprint_config.mk +++ b/fingerprint_config.mk @@ -4,4 +4,5 @@ GOOGLE_CONFIG_FP_STATUS=1 FPC_CONFIG_TRUSTY_CLEAN_TA=1 else # Non factory build, use fingerprint AIDL version +GOOGLE_CONFIG_POWER_NODE=/dev/input/event1 endif From 70859eb8377ea39a02a113a3eae3ba511bced86c Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Fri, 23 Sep 2022 16:53:02 +0800 Subject: [PATCH 5/7] audio: enable hinge angle control and BAACL Bug: 247793430 Test: manual test / LR mixed / LR swap Signed-off-by: Jasmine Cha Change-Id: Ib3af6e2aeba1f90000e88fd6aceddd6aef85518d --- .../config/audio_platform_configuration.xml | 3 ++ audio/felix/tuning/waves/waves_config.ini | 47 +++++++++++-------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/audio/felix/config/audio_platform_configuration.xml b/audio/felix/config/audio_platform_configuration.xml index 88a64f7..6f1cc2b 100644 --- a/audio/felix/config/audio_platform_configuration.xml +++ b/audio/felix/config/audio_platform_configuration.xml @@ -233,6 +233,9 @@ + + + diff --git a/audio/felix/tuning/waves/waves_config.ini b/audio/felix/tuning/waves/waves_config.ini index cf922f6..ff1266c 100644 --- a/audio/felix/tuning/waves/waves_config.ini +++ b/audio/felix/tuning/waves/waves_config.ini @@ -5,7 +5,6 @@ # Putting any value other than 1 would be equivalent to not supported. ######################################################################################################## [HAL_SUPPORTED_FEATURES] -CUSTOM_ACTION_256=0 CUSTOM_ACTION_257=1 ######################################################################################################## @@ -27,12 +26,16 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13 # This should be configured by Waves only unless platform vendor is familiar with MPS structure. ######################################################################################################## [HAL_SUPPORTED_PRESETS] -SPEAKER_MUSIC_UNFOLDED = OM:1,SM:2,OST:OST_SPEAKER +SPEAKER_MUSIC_FOLDED_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER +SPEAKER_MUSIC_UNFOLDED_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER +SPEAKER_MUSIC_CLAMSHELL_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER +SPEAKER_MUSIC_RESERVED_THROTTLE = OM:1,SM:3,OST:OST_SPEAKER +SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,OST:OST_SPEAKER SPEAKER_MUSIC_FOLDED = OM:1,SM:2,OST:OST_SPEAKER -SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER +SPEAKER_MUSIC_UNFOLDED = OM:1,SM:2,OST:OST_SPEAKER +SPEAKER_MUSIC_CLAMSHELL = OM:1,SM:2,OST:OST_SPEAKER +SPEAKER_MUSIC_RESERVED = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER -SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER -HEADSET_MUSIC = OM:2,SM:2 ######################################################################################################## # This defines available CONTROL configurations. Only define the CONTROL if you need it. @@ -40,9 +43,7 @@ HEADSET_MUSIC = OM:2,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 -A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC -USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC +SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE|SPEAKER_MUSIC_UNFOLDED_THROTTLE|SPEAKER_MUSIC_CLAMSHELL_THROTTLE|SPEAKER_MUSIC_RESERVED_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_MUSIC_FOLDED|SPEAKER_MUSIC_UNFOLDED|SPEAKER_MUSIC_CLAMSHELL|SPEAKER_MUSIC_RESERVED|SPEAKER_SAFE_MUSIC [COEFS_CONVERTER_SETTING] AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so @@ -55,15 +56,23 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatSampleSize=4 #AudioFormatIncrement=8 -# CUSTOM_ACTION_LR_MIXED (dev/mode) -[CUSTOM_ACTION_256] -CASE_1=PRIORITY:0,NUMBERS:2:0|1,PRESET:SPEAKER_MUSIC -CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL -CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC - -# CUSTOM_ACTION_LR_MIXED_FOLDED (dev/mode/folded) [CUSTOM_ACTION_257] -CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC_UNFOLDED -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:2:0|1:1,PRESET:SPEAKER_MUSIC_FOLDED +CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0|3,PRESET:SPEAKER_MUSIC_FOLDED +CASE_2=PRIORITY:1,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_CLAMSHELL +CASE_3=PRIORITY:2,NUMBERS:2:0|1:1|2:2,PRESET:SPEAKER_MUSIC_UNFOLDED +CASE_4=PRIORITY:3,NUMBERS:1|2|4194304:2|3|4:1|2:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC +CASE_5=PRIORITY:4,NUMBERS:1|4194304:0|1:1|2:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC +CASE_6=PRIORITY:5,NUMBERS:2:0|1:0:0|3,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE +CASE_7=PRIORITY:6,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE +CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:2,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE +CASE_9=PRIORITY:8,NUMBERS:1|2|4194304:2|3|4:0:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE +CASE_10=PRIORITY:9,NUMBERS:1|4194304:0|1:0:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE +#CASE_11=PRIORITY:10,NUMBERS:2:0|1:1|2:1|2,PRESET:SPEAKER_MUSIC_RESERVED +#CASE_12=PRIORITY:11,NUMBERS:2:0|1:0:1|2,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE + +# Action 257 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, folded_type_t, sound_usage_t(optional) +# - audio_devices_t : current active device +# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip +# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed +# - folded_type_t: 0 - Close, 1 -Clamshell, 2 - Open, 3 - unknown +# - sound_usage_t(optional): 0 - Music, 1 - Movie From 0e8dd372aec86fcdd521dd121634f3ae32e3acb0 Mon Sep 17 00:00:00 2001 From: Yung Ti Su Date: Tue, 27 Sep 2022 13:37:13 +0800 Subject: [PATCH 6/7] Enable the spatial audio function Bug: 248470366 Test: manual Signed-off-by: Yung Ti Su Change-Id: Ie1282d6550052c4bffacaa0b88388bbabe73a208 --- audio/felix/audio-tables.mk | 2 +- audio/felix/config/audio_effects.xml | 2 + .../config/audio_platform_configuration.xml | 7 +- .../config/audio_policy_configuration.xml | 10 +-- ...cy_configuration_a2dp_offload_disabled.xml | 4 +- ...icy_configuration_bluetooth_legacy_hal.xml | 4 -- ...with_le_audio_policy_configuration_7_0.xml | 71 +++++++++++++++++++ audio/felix/config/mixer_paths.xml | 9 ++- device-felix.mk | 11 ++- 9 files changed, 103 insertions(+), 17 deletions(-) create mode 100644 audio/felix/config/bluetooth_with_le_audio_policy_configuration_7_0.xml diff --git a/audio/felix/audio-tables.mk b/audio/felix/audio-tables.mk index 0ab8715..b6ff0d4 100644 --- a/audio/felix/audio-tables.mk +++ b/audio/felix/audio-tables.mk @@ -23,7 +23,7 @@ PRODUCT_COPY_FILES += \ device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.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/felix/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/felix/config/audio_effects.xml b/audio/felix/config/audio_effects.xml index 1718057..e35bfbd 100644 --- a/audio/felix/config/audio_effects.xml +++ b/audio/felix/config/audio_effects.xml @@ -10,6 +10,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/audio/felix/config/audio_platform_configuration.xml b/audio/felix/config/audio_platform_configuration.xml index 6f1cc2b..36c5c39 100644 --- a/audio/felix/config/audio_platform_configuration.xml +++ b/audio/felix/config/audio_platform_configuration.xml @@ -182,7 +182,8 @@ - + + @@ -218,6 +219,10 @@ + + + + diff --git a/audio/felix/config/audio_policy_configuration.xml b/audio/felix/config/audio_policy_configuration.xml index c8f3f6c..b07c021 100644 --- a/audio/felix/config/audio_policy_configuration.xml +++ b/audio/felix/config/audio_policy_configuration.xml @@ -63,8 +63,8 @@ - - + + 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/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml index 3c78481..74a3544 100644 --- a/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -63,8 +63,8 @@ - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/audio/felix/config/mixer_paths.xml b/audio/felix/config/mixer_paths.xml index 0b5010b..7a54043 100644 --- a/audio/felix/config/mixer_paths.xml +++ b/audio/felix/config/mixer_paths.xml @@ -131,6 +131,7 @@ + @@ -153,6 +154,7 @@ + @@ -163,6 +165,7 @@ + @@ -442,15 +445,15 @@ - + - + - + diff --git a/device-felix.mk b/device-felix.mk index 1d36e82..a92da68 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -125,7 +125,16 @@ PRODUCT_COPY_FILES += \ 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 + +# Spatial Audio +PRODUCT_PACKAGES += \ + libspatialaudio + +# declare use of spatial audio +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.spatializer_enabled=true + # Bluetooth SAR test tool PRODUCT_PACKAGES_DEBUG += \ sar_test From 95a10f74ae59e1db41c19795240344d497ce3872 Mon Sep 17 00:00:00 2001 From: Yung Ti Su Date: Tue, 27 Sep 2022 13:37:13 +0800 Subject: [PATCH 7/7] Enable the spatial audio function Bug: 248470366 Test: manual Signed-off-by: Yung Ti Su Change-Id: Ie1282d6550052c4bffacaa0b88388bbabe73a208 Merged-In: Ie1282d6550052c4bffacaa0b88388bbabe73a208 --- audio/felix/audio-tables.mk | 2 +- audio/felix/config/audio_effects.xml | 2 + .../config/audio_platform_configuration.xml | 7 +- .../config/audio_policy_configuration.xml | 10 +-- ...cy_configuration_a2dp_offload_disabled.xml | 4 +- ...icy_configuration_bluetooth_legacy_hal.xml | 4 -- ...with_le_audio_policy_configuration_7_0.xml | 71 +++++++++++++++++++ audio/felix/config/mixer_paths.xml | 9 ++- device-felix.mk | 10 ++- 9 files changed, 102 insertions(+), 17 deletions(-) create mode 100644 audio/felix/config/bluetooth_with_le_audio_policy_configuration_7_0.xml diff --git a/audio/felix/audio-tables.mk b/audio/felix/audio-tables.mk index 0ab8715..b6ff0d4 100644 --- a/audio/felix/audio-tables.mk +++ b/audio/felix/audio-tables.mk @@ -23,7 +23,7 @@ PRODUCT_COPY_FILES += \ device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.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/felix/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/felix/config/audio_effects.xml b/audio/felix/config/audio_effects.xml index 1718057..e35bfbd 100644 --- a/audio/felix/config/audio_effects.xml +++ b/audio/felix/config/audio_effects.xml @@ -10,6 +10,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/audio/felix/config/audio_platform_configuration.xml b/audio/felix/config/audio_platform_configuration.xml index 6f1cc2b..36c5c39 100644 --- a/audio/felix/config/audio_platform_configuration.xml +++ b/audio/felix/config/audio_platform_configuration.xml @@ -182,7 +182,8 @@ - + + @@ -218,6 +219,10 @@ + + + + diff --git a/audio/felix/config/audio_policy_configuration.xml b/audio/felix/config/audio_policy_configuration.xml index c8f3f6c..b07c021 100644 --- a/audio/felix/config/audio_policy_configuration.xml +++ b/audio/felix/config/audio_policy_configuration.xml @@ -63,8 +63,8 @@ - - + + 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/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml index 3c78481..74a3544 100644 --- a/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -63,8 +63,8 @@ - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/audio/felix/config/mixer_paths.xml b/audio/felix/config/mixer_paths.xml index 0b5010b..7a54043 100644 --- a/audio/felix/config/mixer_paths.xml +++ b/audio/felix/config/mixer_paths.xml @@ -131,6 +131,7 @@ + @@ -153,6 +154,7 @@ + @@ -163,6 +165,7 @@ + @@ -442,15 +445,15 @@ - + - + - + diff --git a/device-felix.mk b/device-felix.mk index 8894c41..f832d3f 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -132,7 +132,15 @@ PRODUCT_COPY_FILES += \ 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 + +# Spatial Audio +PRODUCT_PACKAGES += \ + libspatialaudio + +# declare use of spatial audio +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.spatializer_enabled=true # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service