From 9b26f3fae406fa84cf4ddbc00674ccfe7ae2feb5 Mon Sep 17 00:00:00 2001
From: Jaikumar Ganesh <jaikumar@google.com>
Date: Wed, 11 Nov 2009 22:27:49 -0800
Subject: [PATCH] Add BMW and Audi to Auto Pairing black list.

Bug: 2256558
Dr No: Eastham
---
 core/java/android/server/BluetoothService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java
index d1dd3110286b5..bcc570bc1c439 100644
--- a/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@ -504,7 +504,7 @@ public class BluetoothService extends IBluetooth.Stub {
         // disabled.
         private final ArrayList<String> mAutoPairingNameBlacklist =
                 new ArrayList<String>(Arrays.asList(
-                        "Motorola IHF1000", "i.TechBlueBAND", "X5 Stereo v1.3"));
+                        "Motorola IHF1000", "i.TechBlueBAND", "X5 Stereo v1.3", "BMW", "Audi"));
 
         // If this is an outgoing connection, store the address.
         // There can be only 1 pending outgoing connection at a time,
@@ -586,7 +586,8 @@ public class BluetoothService extends IBluetooth.Stub {
             String name = getRemoteName(address);
             if (name != null) {
                 for (String blacklistName : mAutoPairingNameBlacklist) {
-                    if (name.equals(blacklistName)) return true;
+                    if (name.equals(blacklistName) ||
+                            name.startsWith(blacklistName)) return true;
                 }
             }
             return false;