Merge change 22302 into eclair

* changes:
  Set BondState to Canceled when user cancels pairing.
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java
index acee3af2..a7c0425 100644
--- a/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@ -1006,6 +1006,8 @@
         if (!BluetoothDevice.checkBluetoothAddress(address)) {
             return false;
         }
+        mBondState.setBondState(address, BluetoothDevice.BOND_NOT_BONDED,
+                BluetoothDevice.UNBOND_REASON_AUTH_CANCELED);
         address = address.toUpperCase();
         Integer data = mEventLoop.getPasskeyAgentRequestData().remove(address);
         if (data == null) {