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

Merge change I738ed802 into eclair

Browse Source 
* changes:
  Fix BMW and Audi auto pairing lists.
This commit is contained in:
Android (Google) Code Review
2009-11-11 23:27:03 -08:00
parent 34d723d8fa 738ed80262
commit 3c58d279ab
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -502,9 +502,13 @@ public class BluetoothService extends IBluetooth.Stub {
// List of names of Bluetooth devices for which auto pairing should be // List of names of Bluetooth devices for which auto pairing should be
// disabled. // disabled.
private final ArrayList<String> mAutoPairingNameBlacklist = private final ArrayList<String> mAutoPairingExactNameBlacklist =
new ArrayList<String>(Arrays.asList( new ArrayList<String>(Arrays.asList(
"Motorola IHF1000", "i.TechBlueBAND", "X5 Stereo v1.3", "BMW", "Audi")); "Motorola IHF1000", "i.TechBlueBAND", "X5 Stereo v1.3"));
private final ArrayList<String> mAutoPairingPartialNameBlacklist =
new ArrayList<String>(Arrays.asList(
"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,
@@ -585,9 +589,12 @@ 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 : mAutoPairingExactNameBlacklist) {
if (name.equals(blacklistName) || if (name.equals(blacklistName)) return true;
name.startsWith(blacklistName)) return true; }
for (String blacklistName : mAutoPairingPartialNameBlacklist) {
if (name.startsWith(blacklistName)) return true;
} }
} }
return false; return false;