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

am f53f86a7: am 8de4e0ad: Merge change I21d0dca3 into eclair

Browse Source 
Merge commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0' into eclair-mr2-plus-aosp

* commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0':
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
This commit is contained in:
Jaikumar Ganesh
2009-11-05 15:50:11 -08:00
committed by Android Git Automerger
parent 74b0365774 f53f86a743
commit cc2d3572e9
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

@@ -489,14 +489,15 @@ public class BluetoothService extends IBluetooth.Stub {
// Parrot, Zhongshan General K-mate Electronics, Great Well // Parrot, Zhongshan General K-mate Electronics, Great Well
// Electronics, Flaircomm Electronics, Jatty Electronics, Delphi, // Electronics, Flaircomm Electronics, Jatty Electronics, Delphi,
// Clarion, Novero, Denso (Lexus, Toyota), Johnson Controls (Acura), // Clarion, Novero, Denso (Lexus, Toyota), Johnson Controls (Acura),
// Continental Automotive, Harman/Becker, Panasonic/Kyushu Ten // Continental Automotive, Harman/Becker, Panasonic/Kyushu Ten,
// BMW (Motorola PCS)
private final ArrayList<String> mAutoPairingAddressBlacklist = private final ArrayList<String> mAutoPairingAddressBlacklist =
new ArrayList<String>(Arrays.asList( new ArrayList<String>(Arrays.asList(
"00:02:C7", "00:16:FE", "00:19:C1", "00:1B:FB", "00:1E:3D", "00:21:4F", "00:02:C7", "00:16:FE", "00:19:C1", "00:1B:FB", "00:1E:3D", "00:21:4F",
"00:23:06", "00:24:33", "00:A0:79", "00:0E:6D", "00:13:E0", "00:21:E8", "00:23:06", "00:24:33", "00:A0:79", "00:0E:6D", "00:13:E0", "00:21:E8",
"00:60:57", "00:0E:9F", "00:12:1C", "00:18:91", "00:18:96", "00:13:04", "00:60:57", "00:0E:9F", "00:12:1C", "00:18:91", "00:18:96", "00:13:04",
"00:16:FD", "00:22:A0", "00:0B:4C", "00:60:6F", "00:23:3D", "00:C0:59", "00:16:FD", "00:22:A0", "00:0B:4C", "00:60:6F", "00:23:3D", "00:C0:59",
"00:0A:30", "00:1E:AE", "00:1C:D7", "00:80:F0" "00:0A:30", "00:1E:AE", "00:1C:D7", "00:80:F0", "00:12:8A"
)); ));
// List of names of Bluetooth devices for which auto pairing should be // List of names of Bluetooth devices for which auto pairing should be