diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-11-11 22:49:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-11 22:49:45 -0800 |
| commit | 4e552b606cc9fc3e6cac210b3894974709531ec1 (patch) | |
| tree | bfa346ff5a20e5bf76ef78ee5ef28ecf3139a4a3 /core/java/android/server/BluetoothService.java | |
| parent | c5dc6872dac40f87b6b8261c3cd5260a52325aba (diff) | |
| parent | 013b0e531a4318b3e78c9bd0e077d3632fce2280 (diff) | |
| download | frameworks_base-4e552b606cc9fc3e6cac210b3894974709531ec1.zip frameworks_base-4e552b606cc9fc3e6cac210b3894974709531ec1.tar.gz frameworks_base-4e552b606cc9fc3e6cac210b3894974709531ec1.tar.bz2 | |
am 013b0e53: Merge change I143ea844 into eclair
Merge commit '013b0e531a4318b3e78c9bd0e077d3632fce2280' into eclair-mr2
* commit '013b0e531a4318b3e78c9bd0e077d3632fce2280':
Add BMW and Audi to Auto Pairing black list.
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 b32aacc..a6d36e1 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; |