commit 03102638533ca5866033bfc27cea3fea9f14f5e7
author Benson Li <bensonli@google.com> Mon Apr 15 12:38:01 2024 +0000
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Apr 30 03:02:57 2024 +0000
tree 6065516b59444755e965084fa2436aea54004831
parent 98638e51bbdb749fb3084bcaebd5a63379d986b1

Add system property for concurrent encryption on LE and BR/EDR

Bug: 330704060
Change-Id: Ibe6ce2c316f03647da4f23cec5ea095887af5119
Test: make

device-cheetah.mk

diff --git a/device-cheetah.mk b/device-cheetah.mk
index eb60d38..4dd9a2b 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -224,6 +224,10 @@
 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
+
 # Bluetooth EWP test tool
 PRODUCT_PACKAGES_DEBUG += \
     ewp_tool

device-panther.mk

diff --git a/device-panther.mk b/device-panther.mk
index d1d279e..6bf3758 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -194,6 +194,9 @@
 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
 
 # Bluetooth EWP test tool
 PRODUCT_PACKAGES_DEBUG += \