diff options
| author | Jaikumar Ganesh <> | 2009-03-24 18:48:24 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 18:48:24 -0700 |
| commit | 66359e3d2d8059de6fe7a4f284d072201248c91a (patch) | |
| tree | 0cc2740f69352b93a1034bc1a189f76f97e52c14 /core/java/android/server/BluetoothDeviceService.java | |
| parent | 8b532920c4138380b40bf1e4acc0a1c233921118 (diff) | |
| download | frameworks_base-66359e3d2d8059de6fe7a4f284d072201248c91a.zip frameworks_base-66359e3d2d8059de6fe7a4f284d072201248c91a.tar.gz frameworks_base-66359e3d2d8059de6fe7a4f284d072201248c91a.tar.bz2 | |
Automated import from //branches/donutburger/...@140880,140880
Diffstat (limited to 'core/java/android/server/BluetoothDeviceService.java')
| -rw-r--r-- | core/java/android/server/BluetoothDeviceService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/server/BluetoothDeviceService.java b/core/java/android/server/BluetoothDeviceService.java index b7e3846..a815e57 100644 --- a/core/java/android/server/BluetoothDeviceService.java +++ b/core/java/android/server/BluetoothDeviceService.java @@ -385,13 +385,14 @@ public class BluetoothDeviceService extends IBluetoothDevice.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 private final ArrayList<String> mAutoPairingBlacklisted = 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:0A:30", "00:1E:AE", "00:1C:D7" )); public synchronized void loadBondState() { |