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

am 34ca22d2: Merge change 26366 into eclair

Browse Source 
Merge commit '34ca22d25303633c855a738409ea2f8e3f79a713' into eclair-plus-aosp

* commit '34ca22d25303633c855a738409ea2f8e3f79a713':
  Set the bonding for incoming connections only when authentication is requested.
This commit is contained in:
Jaikumar Ganesh
2009-09-22 13:08:08 -07:00
committed by Android Git Automerger
parent ee852f5fbd 34ca22d253
commit d7c4cf5fdf
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);
}
}
mBluetoothService.getBondState().setBondState(address, BluetoothDevice.BOND_BONDING);
return;
}
@@ -404,6 +403,9 @@ class BluetoothEventLoop {
mBluetoothService.cancelPairingUserInput(address);
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;
}