Merge "Additional headsets blacklisted for absolute volume" into mnc-dr1.5-dev

am: 006ede7ac2

* commit '006ede7ac2c509ca6cba4d34b3f048bb3b6f429f':
  Additional headsets blacklisted for absolute volume

Change-Id: I268c859ba121f524147ba0a7878f1705d47b8976

diff --cc device/include/interop_database.h
index b7d45d4,a688adb..695d1e2
--- 1/device/include/interop_database.h
--- 2/device/include/interop_database.h
+++ b/device/include/interop_database.h
@@@ -22,82 -22,51 +22,88 @@@
  
  typedef struct {
    bt_bdaddr_t addr;
 -  uint8_t len;
 +  size_t length;
    interop_feature_t feature;
 -} interop_entry_t;
 +} interop_addr_entry_t;
  
 -static const interop_entry_t interop_database[] = {
 +static const interop_addr_entry_t interop_addr_database[] = {
    // Nexus Remote (Spike)
    // Note: May affect other Asus brand devices
 -  {{0x08, 0x62, 0x66,       0,0,0}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 -  {{0x38, 0x2c, 0x4a, 0xc9,   0,0}, 4, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 -  {{0x38, 0x2c, 0x4a, 0xe6,   0,0}, 4, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 -  {{0x54, 0xa0, 0x50, 0xd9,   0,0}, 4, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 -  {{0xac, 0x9e, 0x17,       0,0,0}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 -  {{0xf0, 0x79, 0x59,       0,0,0}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 +  {{{0x08, 0x62, 0x66,      0,0,0}}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 +  {{{0x38, 0x2c, 0x4a, 0xc9,  0,0}}, 4, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 +  {{{0x38, 0x2c, 0x4a, 0xe6,  0,0}}, 4, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 +  {{{0x54, 0xa0, 0x50, 0xd9,  0,0}}, 4, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 +  {{{0xac, 0x9e, 0x17,      0,0,0}}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 +  {{{0xf0, 0x79, 0x59,      0,0,0}}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
  
    // Motorola Key Link
 -  {{0x1c, 0x96, 0x5a,       0,0,0}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 +  {{{0x1c, 0x96, 0x5a,      0,0,0}}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
  
    // Flic smart button
 -  {{0x80, 0xe4, 0xda, 0x70,   0,0}, 4, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 +  {{{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},
 +  {{{0x9c, 0xdf, 0x03,      0,0,0}}, 3, INTEROP_AUTO_RETRY_PAIRING},
 +
 +  // Ausdom M05 - unacceptably loud volume
 +  {{{0xa0, 0xe9, 0xdb,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
 +
 +  // iKross IKBT83B HS - unacceptably loud volume
 +  {{{0x00, 0x14, 0x02,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
 +
 +  // Jabra EXTREAM2 - unacceptably loud volume
 +  {{{0x1c, 0x48, 0xf9,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
  
+   // Ausdom M05 - unacceptably loud volume
+   {{0xa0, 0xe9, 0xdb,       0,0,0}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
+ 
    // JayBird BlueBuds X - low granularity on volume control
 -  {{0x44, 0x5e, 0xf3,       0,0,0}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
 +  {{{0x44, 0x5e, 0xf3,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
 +  {{{0xd4, 0x9c, 0x28,      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},
 +  {{{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},
 +  {{{0xa0, 0xe9, 0xdb,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
 +
 +  // Mpow Cheetah - unacceptably loud volume
 +  {{{0x00, 0x11, 0xb1,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
  
+   // Mpow Cheetah - unacceptably loud volume
+   {{0x00, 0x11, 0xb1,       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},
 +  {{{0xa4, 0x15, 0x66,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
 +
 +  // Swage Rokitboost HS - unacceptably loud volume
 +  {{{0x00, 0x14, 0xf1,      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},
 +  {{{0x00, 0x26, 0x7e,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
 +
 +  // Subaru car kits (ALPS) - auto-pairing fails and rejects next pairing
 +  {{{0xe0, 0x75, 0x0a,      0,0,0}}, 3, INTEROP_DISABLE_AUTO_PAIRING},
 +
 +  // Unknown keyboard (carried over from auto_pair_devlist.conf)
 +  {{{0x00, 0x0F, 0xF6,      0,0,0}}, 3, INTEROP_KEYBOARD_REQUIRES_FIXED_PIN},
  
    // Jaybird Family
 -  {{0x00, 0x18, 0x91,       0,0,0}, 3, INTEROP_2MBPS_LINK_ONLY}
 +  {{{0x00, 0x18, 0x91,       0,0,0}}, 3, INTEROP_2MBPS_LINK_ONLY},
 +};
 +
 +typedef struct {
 +  char name[20];
 +  size_t length;
 +  interop_feature_t feature;
 +} interop_name_entry_t;
 +
 +static const interop_name_entry_t interop_name_database[] = {
 +  // Carried over from auto_pair_devlist.conf migration
 +  {"BMW",     3, INTEROP_DISABLE_AUTO_PAIRING},
 +  {"Audi",    4, INTEROP_DISABLE_AUTO_PAIRING},
 +  {"Parrot",  6, INTEROP_DISABLE_AUTO_PAIRING},
 +  {"Car",     3, INTEROP_DISABLE_AUTO_PAIRING}
  };
 +