summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bta/av/bta_av_aact.cc7
-rw-r--r--device/include/interop_database.h6
2 files changed, 12 insertions, 1 deletions
diff --git a/bta/av/bta_av_aact.cc b/bta/av/bta_av_aact.cc
index 74311d815..acc4c2c5f 100644
--- a/bta/av/bta_av_aact.cc
+++ b/bta/av/bta_av_aact.cc
@@ -1363,7 +1363,12 @@ void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
p = BTM_ReadRemoteFeatures(p_scb->peer_addr);
if (p != NULL) {
if (HCI_EDR_ACL_2MPS_SUPPORTED(p)) open.edr |= BTA_AV_EDR_2MBPS;
- if (HCI_EDR_ACL_3MPS_SUPPORTED(p)) open.edr |= BTA_AV_EDR_3MBPS;
+ if (HCI_EDR_ACL_3MPS_SUPPORTED(p)) {
+ if (!interop_match_addr(INTEROP_2MBPS_LINK_ONLY,
+ (const bt_bdaddr_t*)&p_scb->peer_addr)) {
+ open.edr |= BTA_AV_EDR_3MBPS;
+ }
+ }
}
#if (BTA_AR_INCLUDED == TRUE)
bta_ar_avdt_conn(BTA_ID_AV, open.bd_addr);
diff --git a/device/include/interop_database.h b/device/include/interop_database.h
index fb94a1146..bac07397b 100644
--- a/device/include/interop_database.h
+++ b/device/include/interop_database.h
@@ -70,6 +70,12 @@ static const interop_addr_entry_t interop_addr_database[] = {
// JayBird Family
{{{0x00, 0x18, 0x91, 0, 0, 0}}, 3, INTEROP_2MBPS_LINK_ONLY},
+ // Sony MBH-10
+ {{{0x20, 0x15, 0x06, 0, 0, 0}}, 3, INTEROP_2MBPS_LINK_ONLY},
+
+ // Uconnect
+ {{{0x9c, 0xdf, 0x03, 0, 0, 0}}, 3, INTEROP_2MBPS_LINK_ONLY},
+
// LG Tone HBS-730 - unacceptably loud volume
{{{0x00, 0x18, 0x6b, 0, 0, 0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
{{{0xb8, 0xad, 0x3e, 0, 0, 0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},