From c0850719ff3cad34a7504a4a250b683000b66bfe Mon Sep 17 00:00:00 2001 From: Barry Date: Mon, 1 Apr 2024 16:01:16 +0000 Subject: [PATCH 1/3] Bluetooth: Enable BQR RF Stats event and Disable BtHalBqrEnable this patch is to cooperate with Bluetooth Stack pre-build for BQRv6 1.Enable BQR RF Stats event (bit 8 = 1) at BQR event Mask 0x100 = 256, default value(295006) + 256 = 295262 2.Disable BtHalBqrEnable to disable config BQR from HAL (BQRv6 workaround) Bug: 332305546 Test: Manual Change-Id: Ie4a4cf4c36598d98ff43ea072a1a0d8cef22fd97 --- bluetooth/bt_vendor_overlay_caiman.conf | 4 ++-- bluetooth/bt_vendor_overlay_komodo.conf | 4 ++-- bluetooth/bt_vendor_overlay_tokay.conf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bluetooth/bt_vendor_overlay_caiman.conf b/bluetooth/bt_vendor_overlay_caiman.conf index 379d6dc7..4370f6b3 100644 --- a/bluetooth/bt_vendor_overlay_caiman.conf +++ b/bluetooth/bt_vendor_overlay_caiman.conf @@ -10,7 +10,7 @@ UartPort = /dev/ttySAC18 SarBackOffHighResolution = true # Update BQR Event Mask property value -BqrEventMaskValueUpdate = 295006 +BqrEventMaskValueUpdate = 295262 # Update BQR Event Mask property value BqrEnergyReportLogging = true @@ -23,7 +23,7 @@ AccelBtDisable = false BtHalRecoveryByRestart = true -BtHalBqrEnable = true +BtHalBqrEnable = false # The hardware stage with old chip revision is no longer # supported by BT firmware. diff --git a/bluetooth/bt_vendor_overlay_komodo.conf b/bluetooth/bt_vendor_overlay_komodo.conf index 379d6dc7..4370f6b3 100644 --- a/bluetooth/bt_vendor_overlay_komodo.conf +++ b/bluetooth/bt_vendor_overlay_komodo.conf @@ -10,7 +10,7 @@ UartPort = /dev/ttySAC18 SarBackOffHighResolution = true # Update BQR Event Mask property value -BqrEventMaskValueUpdate = 295006 +BqrEventMaskValueUpdate = 295262 # Update BQR Event Mask property value BqrEnergyReportLogging = true @@ -23,7 +23,7 @@ AccelBtDisable = false BtHalRecoveryByRestart = true -BtHalBqrEnable = true +BtHalBqrEnable = false # The hardware stage with old chip revision is no longer # supported by BT firmware. diff --git a/bluetooth/bt_vendor_overlay_tokay.conf b/bluetooth/bt_vendor_overlay_tokay.conf index 379d6dc7..4370f6b3 100644 --- a/bluetooth/bt_vendor_overlay_tokay.conf +++ b/bluetooth/bt_vendor_overlay_tokay.conf @@ -10,7 +10,7 @@ UartPort = /dev/ttySAC18 SarBackOffHighResolution = true # Update BQR Event Mask property value -BqrEventMaskValueUpdate = 295006 +BqrEventMaskValueUpdate = 295262 # Update BQR Event Mask property value BqrEnergyReportLogging = true @@ -23,7 +23,7 @@ AccelBtDisable = false BtHalRecoveryByRestart = true -BtHalBqrEnable = true +BtHalBqrEnable = false # The hardware stage with old chip revision is no longer # supported by BT firmware. From d9aefec54a8e07a4a988caefcf4f82833f1ad400 Mon Sep 17 00:00:00 2001 From: Alec Foster Date: Tue, 26 Mar 2024 23:11:41 +0000 Subject: [PATCH 2/3] Only include QfpCalibration on userdebug / eng builds Bug: 331464683 Test: Ensure QfpCalibration is on userdebug / eng biulds and not on user builds. Change-Id: I815b9999e0e74ac5c1dedf51951de21f992630f6 --- fingerprint/ultrasonic_udfps.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fingerprint/ultrasonic_udfps.mk b/fingerprint/ultrasonic_udfps.mk index df84688a..1e9d8a3f 100644 --- a/fingerprint/ultrasonic_udfps.mk +++ b/fingerprint/ultrasonic_udfps.mk @@ -17,12 +17,10 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/qcom/fingerprint/qfp-service \ vendor/qcom/fingerprint/QFingerprintService \ - vendor/qcom/fingerprint/QFPCalibration \ PRODUCT_PACKAGES += \ qfp-daemon \ - QFingerprintService \ - QFPCalibration \ + QFingerprintService PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml @@ -36,6 +34,11 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.qfp.enable_setprop=0 \ log.tag.QFP=3 +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_SOONG_NAMESPACES += \ + vendor/qcom/fingerprint/QFPCalibration +endif + ifneq (,$(findstring factory, $(TARGET_PRODUCT))) PRODUCT_PACKAGES += QfsFactoryTest endif From 96a92dd63617e7ed2ef56a7ad9d42217554eeb0d Mon Sep 17 00:00:00 2001 From: Nikhil Bhanu Date: Thu, 4 Apr 2024 17:02:16 -0700 Subject: [PATCH 3/3] Spatializer: Update configs with latest tunings. auxel commit hash: a2a693b auxel change ID : Id6f1ffa47e7ae03272a663a9996c885cee313098 Bug: 330199578 Change-Id: I4ad7b05dd3b3df87e331c3b3323f9a942fd0023d --- audio/caiman/tuning/spatializer/base | Bin 3448 -> 3912 bytes audio/caiman/tuning/spatializer/mode_2_ch | Bin 924 -> 916 bytes audio/caiman/tuning/spatializer/mode_6_ch | Bin 764 -> 784 bytes audio/komodo/tuning/spatializer/base | Bin 3448 -> 3912 bytes audio/komodo/tuning/spatializer/mode_2_ch | Bin 924 -> 916 bytes audio/komodo/tuning/spatializer/mode_6_ch | Bin 764 -> 784 bytes audio/tokay/tuning/spatializer/base | Bin 3448 -> 3912 bytes audio/tokay/tuning/spatializer/mode_2_ch | Bin 924 -> 916 bytes audio/tokay/tuning/spatializer/mode_6_ch | Bin 764 -> 784 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/caiman/tuning/spatializer/base b/audio/caiman/tuning/spatializer/base index 85771ce217fc74aa5cd5707f936185742b514a22..38cc646e1f4db548866aac2bb32c0836467df2ba 100644 GIT binary patch delta 496 zcmew%bwX~#A2vqr&41Z`GRiR=WMp7q5CmcoAZBK8WMEG0-OL1Jr=_tuO#Z=PhD8Yr zvJwMMY)V*>m1JO5!iKD50jHS~rd!yNlz`m1`3q+Yb3M9iS%5Oe#>V#OJ^?usmmJ7_ zAUOtx1`K^5hvCu(bdelRNl?%+PX5Rt%I?SjvK+<+Sq5eoIWm9@2RRf3&>al&F1nlm oP#qJ40|PHmjv1^A5?wHH9;kSN-0>fvfZ+j~>&n0l6lVjn0Y%wJ{{R30 delta 84 zcmX>h_d{yKAGXPN*f=(`uzzBle2hYC7XSbN diff --git a/audio/caiman/tuning/spatializer/mode_2_ch b/audio/caiman/tuning/spatializer/mode_2_ch index 42b89999d70055091b8152c7319aa38ce164fc3f..470c56cfb061951dd4509b49cfaa8391751f1c52 100644 GIT binary patch delta 42 tcmbQkK81b54My3vIgAX93=9k)S`bJp05Kbb0|Rej?`EdWe;Ma90szpS38Vl3 delta 50 xcmbQjK8Jn74MtUS9u@{h1_lNYEeNDFfS7~9fq^%%cQX@^4Fb%YzcS8e1OUx22l)U1 diff --git a/audio/caiman/tuning/spatializer/mode_6_ch b/audio/caiman/tuning/spatializer/mode_6_ch index b9e8240fae487d2da27739aee792cacd78ab8a4d..94ec6356a9895665cd1dde568bbc5282d341ac0a 100644 GIT binary patch delta 78 zcmeyvI)QD%j)@;wI9M1!puv9Q3I#@E10a)&!GVD{v3D~_`0N=T21Y2&1f(U*nHfMD NK;o!p(EE{j|Fj`wMFfi~iI56-g_HG6;89u8iFfc-CCMeAerCFdfD}m1JO5!iKD50jHS~rd!yNlz`m1`3q+Yb3M9iS%5Oe#>V#OJ^?usmmJ7_ zAUOtx1`K^5hvCu(bdelRNl?%+PX5Rt%I?SjvK+<+Sq5eoIWm9@2RRf3&>al&F1nlm oP#qJ40|PHmjv1^A5?wHH9;kSN-0>fvfZ+j~>&n0l6lVjn0Y%wJ{{R30 delta 84 zcmX>h_d{yKAGXPN*f=(`uzzBle2hYC7XSbN diff --git a/audio/komodo/tuning/spatializer/mode_2_ch b/audio/komodo/tuning/spatializer/mode_2_ch index 42b89999d70055091b8152c7319aa38ce164fc3f..470c56cfb061951dd4509b49cfaa8391751f1c52 100644 GIT binary patch delta 42 tcmbQkK81b54My3vIgAX93=9k)S`bJp05Kbb0|Rej?`EdWe;Ma90szpS38Vl3 delta 50 xcmbQjK8Jn74MtUS9u@{h1_lNYEeNDFfS7~9fq^%%cQX@^4Fb%YzcS8e1OUx22l)U1 diff --git a/audio/komodo/tuning/spatializer/mode_6_ch b/audio/komodo/tuning/spatializer/mode_6_ch index b9e8240fae487d2da27739aee792cacd78ab8a4d..94ec6356a9895665cd1dde568bbc5282d341ac0a 100644 GIT binary patch delta 78 zcmeyvI)QD%j)@;wI9M1!puv9Q3I#@E10a)&!GVD{v3D~_`0N=T21Y2&1f(U*nHfMD NK;o!p(EE{j|Fj`wMFfi~iI56-g_HG6;89u8iFfc-CCMeAerCFdfD}m1JO5!iKD50jHS~rd!yNlz`m1`3q+Yb3M9iS%5Oe#>V#OJ^?usmmJ7_ zAUOtx1`K^5hvCu(bdelRNl?%+PX5Rt%I?SjvK+<+Sq5eoIWm9@2RRf3&>al&F1nlm oP#qJ40|PHmjv1^A5?wHH9;kSN-0>fvfZ+j~>&n0l6lVjn0Y%wJ{{R30 delta 84 zcmX>h_d{yKAGXPN*f=(`uzzBle2hYC7XSbN diff --git a/audio/tokay/tuning/spatializer/mode_2_ch b/audio/tokay/tuning/spatializer/mode_2_ch index 42b89999d70055091b8152c7319aa38ce164fc3f..470c56cfb061951dd4509b49cfaa8391751f1c52 100644 GIT binary patch delta 42 tcmbQkK81b54My3vIgAX93=9k)S`bJp05Kbb0|Rej?`EdWe;Ma90szpS38Vl3 delta 50 xcmbQjK8Jn74MtUS9u@{h1_lNYEeNDFfS7~9fq^%%cQX@^4Fb%YzcS8e1OUx22l)U1 diff --git a/audio/tokay/tuning/spatializer/mode_6_ch b/audio/tokay/tuning/spatializer/mode_6_ch index b9e8240fae487d2da27739aee792cacd78ab8a4d..94ec6356a9895665cd1dde568bbc5282d341ac0a 100644 GIT binary patch delta 78 zcmeyvI)QD%j)@;wI9M1!puv9Q3I#@E10a)&!GVD{v3D~_`0N=T21Y2&1f(U*nHfMD NK;o!p(EE{j|Fj`wMFfi~iI56-g_HG6;89u8iFfc-CCMeAerCFdfD}