diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-11-11 22:27:49 -0800 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumar@google.com> | 2009-11-11 22:43:32 -0800 |
| commit | 9b26f3fae406fa84cf4ddbc00674ccfe7ae2feb5 (patch) | |
| tree | 3127877597552ff39e12cd3e782ae156db6f1bd0 /core/java/android/server/BluetoothService.java | |
| parent | b9c40a65c7fb2121d3076a522248574162bf5f8c (diff) | |
| download | frameworks_base-9b26f3fae406fa84cf4ddbc00674ccfe7ae2feb5.zip frameworks_base-9b26f3fae406fa84cf4ddbc00674ccfe7ae2feb5.tar.gz frameworks_base-9b26f3fae406fa84cf4ddbc00674ccfe7ae2feb5.tar.bz2 | |
Add BMW and Audi to Auto Pairing black list.
Bug: 2256558
Dr No: Eastham
Diffstat (limited to 'core/java/android/server/BluetoothService.java')
| -rw-r--r-- | core/java/android/server/BluetoothService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index d1dd311..bcc570b 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; |