am b520f840: Merge "System/bluetooth/bludroid:Remove the 3 second delay after starting bluetoothd"
* commit 'b520f840479ce62b52072987d8f7883c1edac17b':
System/bluetooth/bludroid:Remove the 3 second delay after starting bluetoothd
diff --git a/brcm_patchram_plus/brcm_patchram_plus.c b/brcm_patchram_plus/brcm_patchram_plus.c
index de748e3..c91a13f 100644
--- a/brcm_patchram_plus/brcm_patchram_plus.c
+++ b/brcm_patchram_plus/brcm_patchram_plus.c
@@ -489,9 +489,6 @@
{
int i = N_HCI;
int proto = HCI_UART_H4;
- if (enable_lpm) {
- proto = HCI_UART_LL;
- }
if (ioctl(uart_fd, TIOCSETD, &i) < 0) {
fprintf(stderr, "Can't set line discipline\n");
return;
diff --git a/data/auto_pairing.conf b/data/auto_pairing.conf
index 6d045ed..6cfa35e 100644
--- a/data/auto_pairing.conf
+++ b/data/auto_pairing.conf
@@ -13,9 +13,9 @@
AddressBlacklist=00:02:C7,00:16:FE,00:19:C1,00:1B:FB,00:1E:3D,00:21:4F,00:23:06,00:24:33,00:A0:79,00:0E:6D,00:13:E0,00:21:E8,00:60:57,00:0E:9F,00:12:1C,00:18:91,00:18:96,00:13:04,00:16:FD,00:22:A0,00:0B:4C,00:60:6F,00:23:3D,00:C0:59,00:0A:30,00:1E:AE,00:1C:D7,00:80:F0,00:12:8A,00:09:93
// Blacklisting by Exact Name:
-ExactNameBlacklist=Motorola IHF1000,i.TechBlueBAND,X5 Stereo v1.3
+ExactNameBlacklist=Motorola IHF1000,i.TechBlueBAND,X5 Stereo v1.3,KML_CAN
// Blacklisting by Partial Name (if name starts with)
-PartialNameBlacklist=BMW,Audi
+PartialNameBlacklist=BMW,Audi,Parrot
// Blacklisting by addition of the address during usage
