am bfcfb7ee: Merge change 22302 into eclair

Merge commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048' into eclair-plus-aosp

* commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048':
  Set BondState to Canceled when user cancels pairing.

core/java/android/server/BluetoothService.java

@@ -1006,6 +1006,8 @@ public class BluetoothService extends IBluetooth.Stub {
         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) {