Merge change 26366 into eclair

* changes: Set the bonding for incoming connections only when authentication is requested.
2009-09-22 16:00:12 -04:00
parent 6c644f248f 7633b89443
commit 34ca22d253
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/server/BluetoothEventLoop.java
+++ b/core/java/android/server/BluetoothEventLoop.java
@@ -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;
    }