DO NOT SUBMIT Revert "DO NOT MERGE Blacklist devices for absolute volume control"
This reverts commit 8fe9b6c9f7538de91c1a3aded53518ca8c6d2fc0.
Change-Id: Ic0aa70bcaec57bf14afa20ac5304e7164174b566
diff --git a/btif/src/btif_rc.c b/btif/src/btif_rc.c
index 15fc9cf..6667ddb 100644
--- a/btif/src/btif_rc.c
+++ b/btif/src/btif_rc.c
@@ -36,7 +36,6 @@
#include "btif_common.h"
#include "btif_util.h"
#include "btif_av.h"
-#include "device/include/interop.h"
#include "hardware/bt_rc.h"
#include "uinput.h"
@@ -325,8 +324,11 @@
bt_bdaddr_t rc_addr;
bdcpy(rc_addr.address, btif_rc_cb.rc_addr);
- if (interop_match(INTEROP_DISABLE_ABSOLUTE_VOLUME, &rc_addr))
- btif_rc_cb.rc_features &= ~BTA_AV_FEAT_ADV_CTRL;
+ // TODO(eisenbach): If devices need to be blacklisted for absolute
+ // volume, it should be added to device/include/interop_database.h
+ // For now, everything goes... If blacklisting is necessary, exclude
+ // the following bit here:
+ // btif_rc_cb.rc_features &= ~BTA_AV_FEAT_ADV_CTRL;
if (btif_rc_cb.rc_features & BTA_AV_FEAT_BROWSE)
{
diff --git a/device/include/interop.h b/device/include/interop.h
index 883e245..b2b01bb 100644
--- a/device/include/interop.h
+++ b/device/include/interop.h
@@ -34,12 +34,7 @@
// 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 58d5ba5..9148f68 100644
--- a/device/include/interop_database.h
+++ b/device/include/interop_database.h
@@ -43,21 +43,5 @@
{{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 f25348a..605d7be 100644
--- a/device/src/interop.c
+++ b/device/src/interop.c
@@ -96,7 +96,6 @@
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";
