Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bfcfb7ee: Merge change 22302 into eclair

Browse Source 
Merge commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048' into eclair-plus-aosp

* commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048':
  Set BondState to Canceled when user cancels pairing.
This commit is contained in:
Jaikumar Ganesh
2009-08-21 11:56:06 -07:00
committed by Android Git Automerger
parent 1afb1cd387 bfcfb7eec6
commit 595b728a83
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/server/BluetoothService.java
View File

@@ -1006,6 +1006,8 @@ public class BluetoothService extends IBluetooth.Stub {
if (!BluetoothDevice.checkBluetoothAddress(address)) { if (!BluetoothDevice.checkBluetoothAddress(address)) {
return false; return false;
} }
mBondState.setBondState(address, BluetoothDevice.BOND_NOT_BONDED,
BluetoothDevice.UNBOND_REASON_AUTH_CANCELED);
address = address.toUpperCase(); address = address.toUpperCase();
Integer data = mEventLoop.getPasskeyAgentRequestData().remove(address); Integer data = mEventLoop.getPasskeyAgentRequestData().remove(address);
if (data == null) { if (data == null) {