From 738ed80262aa26128924c51f59ffd49e1163eb8d Mon Sep 17 00:00:00 2001 From: Jaikumar Ganesh Date: Wed, 11 Nov 2009 23:12:04 -0800 Subject: Fix BMW and Audi auto pairing lists. Bug no:2256558 Dr No:Eastham --- core/java/android/server/BluetoothService.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'core/java/android/server/BluetoothService.java') diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index bcc570b..70af91f 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -502,9 +502,13 @@ public class BluetoothService extends IBluetooth.Stub { // List of names of Bluetooth devices for which auto pairing should be // disabled. - private final ArrayList mAutoPairingNameBlacklist = + private final ArrayList mAutoPairingExactNameBlacklist = new ArrayList(Arrays.asList( - "Motorola IHF1000", "i.TechBlueBAND", "X5 Stereo v1.3", "BMW", "Audi")); + "Motorola IHF1000", "i.TechBlueBAND", "X5 Stereo v1.3")); + + private final ArrayList mAutoPairingPartialNameBlacklist = + new ArrayList(Arrays.asList( + "BMW", "Audi")); // If this is an outgoing connection, store the address. // There can be only 1 pending outgoing connection at a time, @@ -585,9 +589,12 @@ public class BluetoothService extends IBluetooth.Stub { String name = getRemoteName(address); if (name != null) { - for (String blacklistName : mAutoPairingNameBlacklist) { - if (name.equals(blacklistName) || - name.startsWith(blacklistName)) return true; + for (String blacklistName : mAutoPairingExactNameBlacklist) { + if (name.equals(blacklistName)) return true; + } + + for (String blacklistName : mAutoPairingPartialNameBlacklist) { + if (name.startsWith(blacklistName)) return true; } } return false; -- cgit v1.1