diff options
| author | Sharvil Nanavati <sharvil@google.com> | 2016-01-14 11:59:33 -0800 |
|---|---|---|
| committer | Sharvil Nanavati <sharvil@google.com> | 2016-01-14 11:59:33 -0800 |
| commit | 00a44d2508e85b953d7343452063ade286e40ca0 (patch) | |
| tree | 075c60dc79ca2ec9fd663d57f2694fefa457c3de | |
| parent | f7388e685e5064e45ae5ee65ed6b6419cdef929c (diff) | |
| parent | 7408acb7bec88316085791635ecd8117c1cfa1fb (diff) | |
| download | android_system_bt-00a44d2508e85b953d7343452063ade286e40ca0.tar.gz android_system_bt-00a44d2508e85b953d7343452063ade286e40ca0.tar.bz2 android_system_bt-00a44d2508e85b953d7343452063ade286e40ca0.zip | |
resolve merge conflicts of 7408acb7be to mnc-dr1.5-dev.
Change-Id: I5f00746e95c703da91838395aa0c85a660cef2b1
| -rw-r--r-- | device/include/interop.h | 11 | ||||
| -rw-r--r-- | device/include/interop_database.h | 3 | ||||
| -rw-r--r-- | stack/avdt/avdt_l2c.c | 19 |
3 files changed, 1 insertions, 32 deletions
diff --git a/device/include/interop.h b/device/include/interop.h index 6632e5b7a..7765ce814 100644 --- a/device/include/interop.h +++ b/device/include/interop.h @@ -37,16 +37,7 @@ typedef enum { // Devices requiring this workaround do not handle Bluetooth Absolute Volume // control correctly, leading to undesirable (potentially harmful) volume levels // or general lack of controlability. - INTEROP_DISABLE_ABSOLUTE_VOLUME, - - // Some headsets have audio jitter issues because of increased re-transmissions as the - // 3 Mbps packets have a lower link margin, and are more prone to interference. We can - // disable 3DH packets (use only 2DH packets) for the ACL link to improve sensitivity - // when streaming A2DP audio to the headset. Air sniffer logs show reduced - // re-transmissions after switching to 2DH packets. - // - // Disable 3Mbps packets and use only 2Mbps packets for ACL links when streaming audio. - INTEROP_2MBPS_LINK_ONLY + INTEROP_DISABLE_ABSOLUTE_VOLUME } interop_feature_t; // Check if a given |addr| matches a known interoperability workaround as identified diff --git a/device/include/interop_database.h b/device/include/interop_database.h index a688adb2b..d3712bcf9 100644 --- a/device/include/interop_database.h +++ b/device/include/interop_database.h @@ -66,7 +66,4 @@ static const interop_entry_t interop_database[] = { // VW Car Kit - not enough granularity with volume {{0x00, 0x26, 0x7e, 0,0,0}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME}, - - // Jaybird Family - {{0x00, 0x18, 0x91, 0,0,0}, 3, INTEROP_2MBPS_LINK_ONLY} }; diff --git a/stack/avdt/avdt_l2c.c b/stack/avdt/avdt_l2c.c index 4ea5d67da..dbdfc082d 100644 --- a/stack/avdt/avdt_l2c.c +++ b/stack/avdt/avdt_l2c.c @@ -33,7 +33,6 @@ #include "l2cdefs.h" #include "btm_api.h" #include "btm_int.h" -#include "device/include/interop.h" /* callback function declarations */ @@ -203,15 +202,6 @@ void avdt_l2c_connect_ind_cback(BD_ADDR bd_addr, UINT16 lcid, UINT16 psm, UINT8 p_tbl->state = AVDT_AD_ST_SEC_ACP; p_tbl->cfg_flags = AVDT_L2C_CFG_CONN_ACP; - if (interop_match(INTEROP_2MBPS_LINK_ONLY, (const bt_bdaddr_t *)&bd_addr)) { - // Disable 3DH packets for AVDT ACL to improve sensitivity on HS - tACL_CONN *p_acl_cb = btm_bda_to_acl(bd_addr, BT_TRANSPORT_BR_EDR); - btm_set_packet_types(p_acl_cb, (btm_cb.btm_acl_pkt_types_supported | - HCI_PKT_TYPES_MASK_NO_3_DH1 | - HCI_PKT_TYPES_MASK_NO_3_DH3 | - HCI_PKT_TYPES_MASK_NO_3_DH5)); - } - /* Check the security */ rc = btm_sec_mx_access_request (bd_addr, AVDT_PSM, FALSE, BTM_SEC_PROTO_AVDT, @@ -331,15 +321,6 @@ void avdt_l2c_connect_cfm_cback(UINT16 lcid, UINT16 result) p_tbl->lcid = lcid; p_tbl->cfg_flags = AVDT_L2C_CFG_CONN_INT; - if (interop_match(INTEROP_2MBPS_LINK_ONLY, (const bt_bdaddr_t *) &p_ccb->peer_addr)) { - // Disable 3DH packets for AVDT ACL to improve sensitivity on HS - tACL_CONN *p_acl_cb = btm_bda_to_acl(p_ccb->peer_addr, BT_TRANSPORT_BR_EDR); - btm_set_packet_types(p_acl_cb, (btm_cb.btm_acl_pkt_types_supported | - HCI_PKT_TYPES_MASK_NO_3_DH1 | - HCI_PKT_TYPES_MASK_NO_3_DH3 | - HCI_PKT_TYPES_MASK_NO_3_DH5)); - } - /* Check the security */ btm_sec_mx_access_request (p_ccb->peer_addr, AVDT_PSM, TRUE, BTM_SEC_PROTO_AVDT, |