diff options
| author | Ian Pedowitz <ijpedowitz@google.com> | 2015-12-23 05:13:22 +0000 |
|---|---|---|
| committer | Ian Pedowitz <ijpedowitz@google.com> | 2015-12-23 05:13:22 +0000 |
| commit | 22c5f47b7f7bc4739fb1ddf85eb81d8b20f7b222 (patch) | |
| tree | bc21c0f277f786ef4082e6a82dde5a636259cfad /device | |
| parent | 2c8897ca35a93148619d662df03bd9da1b73679a (diff) | |
| download | android_system_bt-22c5f47b7f7bc4739fb1ddf85eb81d8b20f7b222.tar.gz android_system_bt-22c5f47b7f7bc4739fb1ddf85eb81d8b20f7b222.tar.bz2 android_system_bt-22c5f47b7f7bc4739fb1ddf85eb81d8b20f7b222.zip | |
Revert "Blacklist devices for absolute volume control"
This reverts commit 2c8897ca35a93148619d662df03bd9da1b73679a.
Change-Id: Ia184c82fda022b3592753872a86be12a1cefc7d0
Diffstat (limited to 'device')
| -rw-r--r-- | device/include/interop.h | 7 | ||||
| -rw-r--r-- | device/include/interop_database.h | 18 | ||||
| -rw-r--r-- | device/src/interop.c | 1 |
3 files changed, 2 insertions, 24 deletions
diff --git a/device/include/interop.h b/device/include/interop.h index 7765ce814..e2ca682a3 100644 --- a/device/include/interop.h +++ b/device/include/interop.h @@ -32,12 +32,7 @@ typedef enum { // requiring multiple retries to complete pairing. To avoid degrading the user // experience for those devices, automatically re-try pairing if page // timeouts are received during pairing. - INTEROP_AUTO_RETRY_PAIRING, - - // 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 + INTEROP_AUTO_RETRY_PAIRING } 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 2e5c7db22..4f95be916 100644 --- a/device/include/interop_database.h +++ b/device/include/interop_database.h @@ -43,21 +43,5 @@ static const interop_entry_t interop_database[] = { {{0x80, 0xe4, 0xda, 0x70, 0,0}, 4, INTEROP_DISABLE_LE_SECURE_CONNECTIONS}, // BMW car kits (Harman/Becker) - {{0x9c, 0xdf, 0x03, 0,0,0}, 3, INTEROP_AUTO_RETRY_PAIRING}, - - // JayBird BlueBuds X - low granularity on volume control - {{0x44, 0x5e, 0xf3, 0,0,0}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME}, - - // 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}, - - // LG Tone HV-800 - unacceptably loud volume - {{0xa0, 0xe9, 0xdb, 0,0,0}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME}, - - // SOL REPUBLIC Tracks Air - unable to adjust volume back off from max - {{0xa4, 0x15, 0x66, 0,0,0}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME}, - - // VW Car Kit - not enough granularity with volume - {{0x00, 0x26, 0x7e, 0,0,0}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME}, + {{0x9c, 0xdf, 0x03, 0,0,0}, 3, INTEROP_AUTO_RETRY_PAIRING} }; diff --git a/device/src/interop.c b/device/src/interop.c index 3a726d781..84decd765 100644 --- a/device/src/interop.c +++ b/device/src/interop.c @@ -31,7 +31,6 @@ static const char* interop_feature_string(const interop_feature_t feature) { switch (feature) { CASE_RETURN_STR(INTEROP_DISABLE_LE_SECURE_CONNECTIONS) CASE_RETURN_STR(INTEROP_AUTO_RETRY_PAIRING) - CASE_RETURN_STR(INTEROP_DISABLE_ABSOLUTE_VOLUME) } return "UNKNOWN"; |