Add Subaru and Nissan car kits to auto pair blacklistnougat-dev

Bug: 29157087
Change-Id: If227963b939a9b0ed55e6d900364c71932d3cfe8

1 files changed, 25 insertions, 21 deletions

diff --git a/device/include/interop_database.h b/device/include/interop_database.h
index 7ce3c07b8..49cb8a5d4 100644
--- a/device/include/interop_database.h
+++ b/device/include/interop_database.h
@@ -36,31 +36,28 @@ static const interop_addr_entry_t interop_addr_database[] = {
   {{{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},
-
-  // Flic smart button
-  {{{0x80, 0xe4, 0xda, 0x70,  0,0}}, 4, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
+  // Ausdom M05 - unacceptably loud volume
+  {{{0xa0, 0xe9, 0xdb,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
 
   // BMW car kits (Harman/Becker)
   {{{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},
+  // Flic smart button
+  {{{0x80, 0xe4, 0xda, 0x70,  0,0}}, 4, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
 
   // iKross IKBT83B HS - unacceptably loud volume
   {{{0x00, 0x14, 0x02,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
 
-  // Jabra EXTREAM2 - unacceptably loud volume
+  // Jabra EXTREME 2 - 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},
   {{{0xd4, 0x9c, 0x28,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
 
+  // JayBird Family
+  {{{0x00, 0x18, 0x91,      0,0,0}}, 3, INTEROP_2MBPS_LINK_ONLY},
+
   // 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},
@@ -68,15 +65,22 @@ static const interop_addr_entry_t interop_addr_database[] = {
   // LG Tone HV-800 - unacceptably loud volume
   {{{0xa0, 0xe9, 0xdb,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
 
+  // Motorola Key Link
+  {{{0x1c, 0x96, 0x5a,      0,0,0}}, 3, INTEROP_DISABLE_LE_SECURE_CONNECTIONS},
+
   // 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},
+  // Nissan car kits (ALPS) - auto-pairing fails and rejects next pairing
+  {{{0x34, 0xc7, 0x31,      0,0,0}}, 3, INTEROP_DISABLE_AUTO_PAIRING},
 
   // SOL REPUBLIC Tracks Air - unable to adjust volume back off from max
   {{{0xa4, 0x15, 0x66,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
 
+  // Subaru car kits (ALPS) - auto-pairing fails and rejects next pairing
+  {{{0x00, 0x07, 0x04,      0,0,0}}, 3, INTEROP_DISABLE_AUTO_PAIRING},
+  {{{0xe0, 0x75, 0x0a,      0,0,0}}, 3, INTEROP_DISABLE_AUTO_PAIRING},
+
   // Swage Rokitboost HS - unacceptably loud volume
   {{{0x00, 0x14, 0xf1,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
 
@@ -84,14 +88,8 @@ static const interop_addr_entry_t interop_addr_database[] = {
   {{{0x00, 0x26, 0x7e,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
   {{{0x90, 0x03, 0xb7,      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},
 };
 
 typedef struct {
@@ -102,9 +100,15 @@ typedef struct {
 
 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},
+  {"BMW",     3, INTEROP_DISABLE_AUTO_PAIRING},
   {"Parrot",  6, INTEROP_DISABLE_AUTO_PAIRING},
-  {"Car",     3, INTEROP_DISABLE_AUTO_PAIRING}
+  {"Car",     3, INTEROP_DISABLE_AUTO_PAIRING},
+
+  // Nissan Quest rejects pairing after "0000"
+  {"NISSAN",  6, INTEROP_DISABLE_AUTO_PAIRING},
+
+  // Subaru car kits ("CAR M_MEDIA")
+  {"CAR",     3, INTEROP_DISABLE_AUTO_PAIRING},
 };