summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@google.com>2022-09-29 04:21:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-09-29 04:21:09 +0000
commitb2c67843c1e8cc3a792b0ff7f965e6ac77c0aae6 (patch)
tree078f92ecd00303b719001c8e653a9ba0a8265d6c
parentb0e7fdc0d75be3bf0f5a0691741b9fa42c405425 (diff)
parentb864c1bf0adc86f665b0daf9eb90343fc9fa4b5d (diff)
downloadgoldfish-b2c67843c1e8cc3a792b0ff7f965e6ac77c0aae6.tar.gz
Merge "Disable asha from bluetooth profile" into tm-dev am: b864c1bf0a
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish/+/20075256 Change-Id: I5765c9720bdc783090225fc970a141d78b6771d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--bluetooth.prop8
1 files changed, 6 insertions, 2 deletions
diff --git a/bluetooth.prop b/bluetooth.prop
index 2bce15e6..0b2ef7a9 100644
--- a/bluetooth.prop
+++ b/bluetooth.prop
@@ -9,12 +9,17 @@
bluetooth.device.class_of_device=90,2,12
# Set supported Bluetooth profiles to enabled
-bluetooth.profile.asha.central.enabled=true
+
+# Disable asha profile as it will disable
+# the cts-verifier multi advertising tests (b/249536741)
+# bluetooth.profile.asha.central.enabled=true
+
bluetooth.profile.a2dp.source.enabled=true
bluetooth.profile.avrcp.target.enabled=true
bluetooth.profile.bap.broadcast.assist.enabled=true
bluetooth.profile.bap.unicast.client.enabled=true
bluetooth.profile.bas.client.enabled=true
+bluetooth.profile.ccp.server.enabled=true
bluetooth.profile.csip.set_coordinator.enabled=true
bluetooth.profile.gatt.enabled=true
bluetooth.profile.hap.client.enabled=true
@@ -27,5 +32,4 @@ bluetooth.profile.opp.enabled=true
bluetooth.profile.pan.nap.enabled=true
bluetooth.profile.pan.panu.enabled=true
bluetooth.profile.pbap.server.enabled=true
-bluetooth.profile.ccp.server.enabled=true
bluetooth.profile.vcp.controller.enabled=true