diff options
| author | Jaikumar Ganesh <jaikumarg@android.com> | 2011-05-20 14:21:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-20 14:21:23 -0700 |
| commit | d7030e551aa99ed9f533d46de5f3443ceb4c5703 (patch) | |
| tree | f328c506e24313334ccd9a75fb590f205aec23af /core/java | |
| parent | 0c2d82c6f28ab6ec73d66fcc1f62e067829df426 (diff) | |
| parent | 198ed3e46af4bd51fa6be0186bacdde9e832ba94 (diff) | |
| download | frameworks_base-d7030e551aa99ed9f533d46de5f3443ceb4c5703.zip frameworks_base-d7030e551aa99ed9f533d46de5f3443ceb4c5703.tar.gz frameworks_base-d7030e551aa99ed9f533d46de5f3443ceb4c5703.tar.bz2 | |
am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code."
* commit '198ed3e46af4bd51fa6be0186bacdde9e832ba94':
BT: Wrong publishing result of bonding error code.
Diffstat (limited to 'core/java')
| -rwxr-xr-x[-rw-r--r--] | core/java/android/server/BluetoothService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index 4d4d309..6144766 100644..100755 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -1351,7 +1351,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; } |