Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 013b0e53: Merge change I143ea844 into eclair

Browse Source 
Merge commit '013b0e531a4318b3e78c9bd0e077d3632fce2280' into eclair-mr2

* commit '013b0e531a4318b3e78c9bd0e077d3632fce2280':
  Add BMW and Audi to Auto Pairing black list.
This commit is contained in:
Jaikumar Ganesh
2009-11-11 22:49:45 -08:00
committed by Android Git Automerger
parent c5dc6872da 013b0e531a
commit 4e552b606c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/server/BluetoothService.java
View File

@@ -504,7 +504,7 @@ public class BluetoothService extends IBluetooth.Stub {
// disabled. // disabled.
private final ArrayList<String> mAutoPairingNameBlacklist = private final ArrayList<String> mAutoPairingNameBlacklist =
new ArrayList<String>(Arrays.asList( 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. // If this is an outgoing connection, store the address.
// There can be only 1 pending outgoing connection at a time, // 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); String name = getRemoteName(address);
if (name != null) { if (name != null) {
for (String blacklistName : mAutoPairingNameBlacklist) { for (String blacklistName : mAutoPairingNameBlacklist) {
if (name.equals(blacklistName)) return true; if (name.equals(blacklistName) ||
name.startsWith(blacklistName)) return true;
} }
} }
return false; return false;