diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-11-05 15:39:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-05 15:39:40 -0800 |
| commit | f53f86a743a91b4383e480dcf44a8e7b16ca7fa0 (patch) | |
| tree | 2f7483393939ad2985eddf7aaffa53214c0c9dbf /core/java/android/server/BluetoothService.java | |
| parent | e334ce27f1c936af54748c1312cfdeeb3eea7184 (diff) | |
| parent | 8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd (diff) | |
| download | frameworks_base-f53f86a743a91b4383e480dcf44a8e7b16ca7fa0.zip frameworks_base-f53f86a743a91b4383e480dcf44a8e7b16ca7fa0.tar.gz frameworks_base-f53f86a743a91b4383e480dcf44a8e7b16ca7fa0.tar.bz2 | |
am 8de4e0ad: Merge change I21d0dca3 into eclair
Merge commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-mr2
* commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
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 0db29a4..b32aacc 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -489,14 +489,15 @@ public class BluetoothService extends IBluetooth.Stub { // Parrot, Zhongshan General K-mate Electronics, Great Well // Electronics, Flaircomm Electronics, Jatty Electronics, Delphi, // 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 = new ArrayList<String>(Arrays.asList( "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: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: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 |