OSDN Git Service

BT: Wrong publishing result of bonding error code.
authorArek Lichwa <arkadiusz.lichwa@tieto.com>
Wed, 23 Feb 2011 10:52:34 +0000 (11:52 +0100)
committerchristian bejram <christian.bejram@stericsson.com>
Thu, 5 May 2011 08:41:25 +0000 (10:41 +0200)
During bonding bluez stack publish the error code over dbus.
JNI gets the error, in this ER case:
org.bluez.Error.AuthenticationFailed (Authentication Failed),
and then wrong call to overloaded setBondState() is made on
callstack using default result code parameter as 0 (BOND_SUCCESS).

Change-Id: I6f743cedc76e63d0c2a35e89d3aa48267b89c06e
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
core/java/android/server/BluetoothService.java [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 4d4d309..6144766
@@ -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;
     }