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

Merge change 26366 into eclair

Browse Source 
* changes:
  Set the bonding for incoming connections only when authentication is requested.
This commit is contained in:
Android (Google) Code Review
2009-09-22 16:00:12 -04:00
parent 6c644f248f 7633b89443
commit 34ca22d253
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/server/BluetoothEventLoop.java
View File

@@ -247,7 +247,6 @@ class BluetoothEventLoop {
addDevice(address, properties); addDevice(address, properties);
} }
} }
mBluetoothService.getBondState().setBondState(address, BluetoothDevice.BOND_BONDING);
return; return;
} }
@@ -404,6 +403,9 @@ class BluetoothEventLoop {
mBluetoothService.cancelPairingUserInput(address); mBluetoothService.cancelPairingUserInput(address);
return null; return null;
} }
// Set state to BONDING, for incoming connections it will be set here.
// For outgoing connections, it gets set when call createBond.
mBluetoothService.getBondState().setBondState(address, BluetoothDevice.BOND_BONDING);
return address; return address;
} }