drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9395b465: Merge "Fix to get A2DP to connect after unpairing" into gingerbread

Browse Source 
Merge commit '9395b4656aca4b00d080ada89a44631459ad7b85' into gingerbread-plus-aosp

* commit '9395b4656aca4b00d080ada89a44631459ad7b85':
  Fix to get A2DP to connect after unpairing
This commit is contained in:
Jaikumar Ganesh
2010-09-09 10:26:54 -07:00
committed by Android Git Automerger
parent 8986f62b30 9395b4656a
commit 049912b76f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,7 +414,13 @@ class BluetoothEventLoop {
mBluetoothService.sendUuidIntent(address);
} else if (name.equals("Paired")) {
if (propValues[1].equals("true")) {
mBluetoothService.getBondState().setBondState(address, BluetoothDevice.BOND_BONDED);
// If locally initiated pairing, we will
// not go to BOND_BONDED state until we have received a
// successful return value in onCreatePairedDeviceResult
if (null == mBluetoothService.getBondState().getPendingOutgoingBonding()) {
mBluetoothService.getBondState().setBondState(address,
BluetoothDevice.BOND_BONDED);
}
} else {
mBluetoothService.getBondState().setBondState(address,
BluetoothDevice.BOND_NONE);