am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code."

* commit 'd7030e551aa99ed9f533d46de5f3443ceb4c5703':
  BT: Wrong publishing result of bonding error code.
This commit is contained in:
Jaikumar Ganesh
2011-05-20 14:52:27 -07:00
committed by Android Git Automerger

2
core/java/android/server/BluetoothService.java Normal file → Executable file
View File

@ -1104,7 +1104,7 @@ public class BluetoothService extends IBluetooth.Stub {
}
/*package*/ synchronized boolean setBondState(String address, int state, int reason) {
mBondState.setBondState(address.toUpperCase(), state);
mBondState.setBondState(address.toUpperCase(), state, reason);
return true;
}