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 /device | |
| 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
Diffstat (limited to 'device')
| -rw-r--r-- | device/include/interop.h | 11 | ||||
| -rw-r--r-- | device/include/interop_database.h | 3 |
2 files changed, 1 insertions, 13 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} }; |