From a9af1a2b48d9f9c15622d1512d6ae1b54e545024 Mon Sep 17 00:00:00 2001 From: Benson Li Date: Mon, 15 Apr 2024 12:23:16 +0000 Subject: [PATCH 1/2] Add system property for concurrent encryption on LE and BR/EDR Bug: 330704060 Change-Id: Idd154d27dedbb15262a4ce4d478fedaa6748b40f Merged-In: Idd154d27dedbb15262a4ce4d478fedaa6748b40f Test: make (cherry picked from commit ca94ed1a3d547262dc9c3640bfe6143409f153fb) --- device-caiman.mk | 4 ++++ device-komodo.mk | 4 ++++ device-tokay.mk | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/device-caiman.mk b/device-caiman.mk index 6456475f..b7793e99 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -380,6 +380,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510 +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Keyboard height ratio and bottom padding in dp for portrait mode PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=8 \ diff --git a/device-komodo.mk b/device-komodo.mk index 69bc5b92..a0a53adf 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -377,6 +377,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510 +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Exynos RIL and telephony # Support RIL Domain-selection SUPPORT_RIL_DOMAIN_SELECTION := true diff --git a/device-tokay.mk b/device-tokay.mk index c71e6cb3..67212af1 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -344,6 +344,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510 +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Exynos RIL and telephony # Support RIL Domain-selection SUPPORT_RIL_DOMAIN_SELECTION := true From 8f6809863fcd2267f1fb3ad1667e51e409b1b47e Mon Sep 17 00:00:00 2001 From: Yen-Chao Chen Date: Tue, 7 May 2024 10:37:06 +0800 Subject: [PATCH 2/2] remove syna touch dump Because we added the touch reset at the end of gti touch dump, it's possible making conflict between touch resetting and syna touch dump. As all the information from the syna touch dump is already covered by the gti touch dump, remove the syna touch dump to avoid conflict. Bug: 338935477 Test: trigger bugreport and there is no error in the log. Change-Id: I395e45fd2f485c76ad80d05caa20cd27b34d1094 Signed-off-by: Yen-Chao Chen --- device-caiman.mk | 1 - device-komodo.mk | 1 - device-tokay.mk | 1 - 3 files changed, 3 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 4a349e75..b2d37f38 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -49,7 +49,6 @@ include device/google/zumapro/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/gti/predump_gti.mk -include device/google/gs-common/touch/syna/predump_syna20.mk include device/google/caimito/fingerprint/ultrasonic_udfps.mk include device/google/gs-common/modem/radio_ext/radio_ext.mk include device/google/gs-common/pixelsupport/pixelsupport.mk diff --git a/device-komodo.mk b/device-komodo.mk index 0f74a6ce..dee46ca0 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -49,7 +49,6 @@ include device/google/zumapro/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/gti/predump_gti.mk -include device/google/gs-common/touch/syna/predump_syna20.mk include device/google/caimito/fingerprint/ultrasonic_udfps.mk include device/google/gs-common/modem/radio_ext/radio_ext.mk include device/google/gs-common/pixelsupport/pixelsupport.mk diff --git a/device-tokay.mk b/device-tokay.mk index f7ac48a6..bd9da705 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -39,7 +39,6 @@ include device/google/zumapro/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/gti/predump_gti.mk -include device/google/gs-common/touch/syna/predump_syna20.mk include device/google/caimito/fingerprint/ultrasonic_udfps.mk include device/google/gs-common/modem/radio_ext/radio_ext.mk include device/google/gs-common/pixelsupport/pixelsupport.mk