diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-10-08 17:30:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-08 17:30:34 -0700 |
| commit | 2fb4da9f711da342fa4fb4eb083c95176329c094 (patch) | |
| tree | ef619d657b15aa892a11bbbe644b74fabe8e13bc /framework/java | |
| parent | 58a00724e7c2fb41a6b86129e67b8e0427002add (diff) | |
| parent | 8640fe7f971532097ea032e82507c0518d682393 (diff) | |
am 9d5b5899: Merge change Ie5d93b7e into eclair
Merge commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-mr2
* commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
Set the Bond State to NONE when we receive a Agent Cancel.
Diffstat (limited to 'framework/java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothDevice.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java index 9c23746494..39a74acee8 100644 --- a/framework/java/android/bluetooth/BluetoothDevice.java +++ b/framework/java/android/bluetooth/BluetoothDevice.java @@ -287,9 +287,13 @@ public final class BluetoothDevice implements Parcelable { /** A bond attempt failed because of repeated attempts * @hide */ public static final int UNBOND_REASON_REPEATED_ATTEMPTS = 7; + /** A bond attempt failed because we received an Authentication Cancel + * by remote end + * @hide */ + public static final int UNBOND_REASON_REMOTE_AUTH_CANCELED = 8; /** An existing bond was explicitly revoked * @hide */ - public static final int UNBOND_REASON_REMOVED = 8; + public static final int UNBOND_REASON_REMOVED = 9; /** The user will be prompted to enter a pin * @hide */ |