diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-15 11:29:52 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-15 11:29:52 -0400 |
| commit | 82dbf6785184a9a0808210294365e32ff21add9c (patch) | |
| tree | 4936f525eb0cb1c3e3c5e612c85cf9411ded8684 | |
| parent | 2bccbcc777ca48a08663c16e90ea3f76ace6eb07 (diff) | |
| parent | adbaef234e1bd7bbec561fb6291bae394a412ce8 (diff) | |
Merge change 24998 into eclair
* changes:
Add Panasonic KX-TH112 to blacklist.
| -rw-r--r-- | core/java/android/server/BluetoothService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index 78e2c273e779..de0cad7578ca 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -398,14 +398,14 @@ 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 + // Continental Automotive, Harman/Becker, Panasonic/Kyushu Ten 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:0A:30", "00:1E:AE", "00:1C:D7", "00:80:F0" )); // List of names of Bluetooth devices for which auto pairing should be |