Revert "Fix the interoperability mechanism for 2Mbps-only links for audio"

This reverts commit 039f9a8f09ab25b4b16acfd9aca3733108d02b28.

Reason for revert: Failing build in oc-mr1-dev

Change-Id: I186c116d4b26cd4b92938066309a898b82ef90bc
Merged-In: Idaa25e18c0b017d8859aab723244fdc2613fc159

diff --git a/bta/av/bta_av_aact.cc b/bta/av/bta_av_aact.cc
index acc4c2c..74311d8 100644 (file)
--- a/bta/av/bta_av_aact.cc
+++ b/bta/av/bta_av_aact.cc
@@ -1363,12 +1363,7 @@ 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)) {
-        if (!interop_match_addr(INTEROP_2MBPS_LINK_ONLY,
-                                (const bt_bdaddr_t*)&p_scb->peer_addr)) {
-          open.edr |= BTA_AV_EDR_3MBPS;
-        }
-      }
+      if (HCI_EDR_ACL_3MPS_SUPPORTED(p)) 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 bac0739..fb94a11 100644 (file)
--- a/device/include/interop_database.h
+++ b/device/include/interop_database.h
@@ -70,12 +70,6 @@ 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},