From dbbe67c71a9022e49a9d6c1139299713ba2a4deb Mon Sep 17 00:00:00 2001 From: Rohit Sekhar Date: Tue, 18 Jul 2023 16:23:48 +0530 Subject: [PATCH 1/2] FP4: Bump to FP4.SP2G.B.079.20230624 Fingerprint: Fairphone/FP4eea/FP4:12/SKQ1.220201.001/SP2G:user/release-keys --- BoardConfig.mk | 2 +- lineage_FP4.mk | 4 ++-- proprietary-files.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index c823d63..f04e497 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -153,7 +153,7 @@ TARGET_USERIMAGES_USE_F2FS := true ENABLE_VENDOR_RIL_SERVICE := true # Security patch level -VENDOR_SECURITY_PATCH := 2023-05-05 +VENDOR_SECURITY_PATCH := 2023-06-05 # SEPolicy include device/qcom/sepolicy_vndr/SEPolicy.mk diff --git a/lineage_FP4.mk b/lineage_FP4.mk index dcdb94e..9fd6cf3 100644 --- a/lineage_FP4.mk +++ b/lineage_FP4.mk @@ -27,10 +27,10 @@ PRODUCT_MANUFACTURER := Fairphone PRODUCT_SYSTEM_NAME := FP4eea -BUILD_FINGERPRINT := "Fairphone/FP4eea/FP4:12/SKQ1.220201.001/SP29:user/release-keys" +BUILD_FINGERPRINT := "Fairphone/FP4eea/FP4:12/SKQ1.220201.001/SP2G:user/release-keys" PRODUCT_BUILD_PROP_OVERRIDES += \ TARGET_PRODUCT=FP4eea \ - PRIVATE_BUILD_DESC="qssi-user 12 SKQ1.220201.001 SP29 release-keys" + PRIVATE_BUILD_DESC="qssi-user 12 SKQ1.220201.001 SP2G release-keys" PRODUCT_GMS_CLIENTID_BASE := android-alcatel diff --git a/proprietary-files.txt b/proprietary-files.txt index b116f1e..4d05f9f 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,4 +1,4 @@ -# Unpinned blobs from Fairphone/FP4eea/FP4:12/SKQ1.220201.001/SP29:user/release-keys +# Unpinned blobs from Fairphone/FP4eea/FP4:12/SKQ1.220201.001/SP2G:user/release-keys # ACDB vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Bluetooth_cal.acdb:vendor/etc/acdbdata/MTP/lito-lagoonmtp-snd-card/Bluetooth_cal.acdb -- GitLab From d6dad2f93d9b056fe704c7651c78f7d6925eaf2b Mon Sep 17 00:00:00 2001 From: Rohit Sekhar Date: Tue, 18 Jul 2023 16:33:26 +0530 Subject: [PATCH 2/2] FP4: Add back aptX support - This reverts commit 2030ab6c451cb47fda435e2346821c00c51c1fcb. - SP2G firmware fixes the issue. --- audio/audio_policy_configuration.xml | 6 +++--- proprietary-files.txt | 8 ++++++++ vendor.prop | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index 5c4e7aa..7c9916c 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -253,17 +253,17 @@ samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/> + encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC"> + encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC"> + encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC"> diff --git a/proprietary-files.txt b/proprietary-files.txt index 4d05f9f..5ef87b6 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -34,6 +34,10 @@ vendor/lib/rfsa/adsp/libsns_low_lat_stream_skel.so vendor/lib64/rfsa/adsp/libsns_device_mode_skel.so vendor/lib64/rfsa/adsp/libsns_low_lat_stream_skel.so +# ADSP modules (aptX) +vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDADV_Encoder.so +vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDAD_Speech_Decoder.so + # Audio vendor/lib/libacdb-fts.so vendor/lib/libacdbloader.so @@ -74,6 +78,10 @@ vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so +# Bluetooth (aptX) - from crosshatch - RQ1A.201205.003 +system_ext/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc +system_ext/lib64/libaptXHD_encoder.so|e13fa70c97caaa24d061678bdee608eb8850a69e + # Camera vendor/lib/libswvdec.so vendor/lib64/camera/com.qti.eeprom.gt24p128ef_imx576.so diff --git a/vendor.prop b/vendor.prop index 37eb1d1..2bbfd20 100644 --- a/vendor.prop +++ b/vendor.prop @@ -44,10 +44,10 @@ vendor.audio_hal.period_size=192 vendor.voice.path.for.pcm.voip=true # Bluetooth -persist.bluetooth.a2dp_offload.cap=sbc-aac-ldac +persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac persist.bluetooth.a2dp_offload.disabled=false persist.sys.fflag.override.settings_bluetooth_hearing_aid=true -persist.vendor.bt.a2dp_offload_cap=sbc-aac-ldac +persist.vendor.bt.a2dp_offload_cap=sbc-aac-aptx-aptxhd-ldac persist.vendor.bt.aac_frm_ctl.enabled=true persist.vendor.bt.aac_vbr_frm_ctl.enabled=true persist.vendor.qcom.bluetooth.scram.enabled=true -- GitLab