diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-09-10 22:00:05 -0700 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumar@google.com> | 2009-09-11 14:12:48 -0700 |
| commit | 32d8571f509c392dca732c243e9b2138c15daecf (patch) | |
| tree | 8a1358f522c834cd80b098a2810c74e333980a65 /core/java/android/bluetooth | |
| parent | 162ec9993e9695946a6b954fd53eebb63e055540 (diff) | |
| download | frameworks_base-32d8571f509c392dca732c243e9b2138c15daecf.zip frameworks_base-32d8571f509c392dca732c243e9b2138c15daecf.tar.gz frameworks_base-32d8571f509c392dca732c243e9b2138c15daecf.tar.bz2 | |
Changes for BT 2.1
1) Handle incoming 2.1 pairing requests
2) Modify displaying error messages on bond failures.
3) Add delay while accepting incoming pairing for certain 2.1 devices.
When MITM is on, the link key request might come more than once.
Auto accept with a delay.
4) Handle DisplayPasskey callback for pairing a 2.1 keyboard with
a 2.1 device
Diffstat (limited to 'core/java/android/bluetooth')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index a9cec50..b1861ac 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -250,7 +250,7 @@ public final class BluetoothDevice implements Parcelable { * @hide */ public static final int BOND_SUCCESS = 0; /** A bond attempt failed because pins did not match, or remote device did - * not respond to pin request in time + * not respond to pin request in time * @hide */ public static final int UNBOND_REASON_AUTH_FAILED = 1; /** A bond attempt failed because the other side explicilty rejected @@ -266,9 +266,15 @@ public final class BluetoothDevice implements Parcelable { /** A bond attempt failed because a discovery is in progress * @hide */ public static final int UNBOND_REASON_DISCOVERY_IN_PROGRESS = 5; + /** A bond attempt failed because of authentication timeout + * @hide */ + public static final int UNBOND_REASON_AUTH_TIMEOUT = 6; + /** A bond attempt failed because of repeated attempts + * @hide */ + public static final int UNBOND_REASON_REPEATED_ATTEMPTS = 7; /** An existing bond was explicitly revoked * @hide */ - public static final int UNBOND_REASON_REMOVED = 6; + public static final int UNBOND_REASON_REMOVED = 8; /** The user will be prompted to enter a pin * @hide */ @@ -278,7 +284,13 @@ public final class BluetoothDevice implements Parcelable { public static final int PAIRING_VARIANT_PASSKEY = 1; /** The user will be prompted to confirm the passkey displayed on the screen * @hide */ - public static final int PAIRING_VARIANT_CONFIRMATION = 2; + public static final int PAIRING_VARIANT_PASSKEY_CONFIRMATION = 2; + /** The user will be prompted to accept or deny the incoming pairing request + * @hide */ + public static final int PAIRING_VARIANT_CONSENT = 3; + /** The user will be prompted to enter the passkey displayed on remote device + * @hide */ + public static final int PAIRING_VARIANT_DISPLAY_PASSKEY = 4; private static IBluetooth sService; /* Guarenteed constant after first object constructed */ |