Merge change 26366 into eclair

* changes:
  Set the bonding for incoming connections only when authentication is requested.

1 files changed, 3 insertions, 1 deletions

diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java
index f9ab31c595b7..f3bc3a6b60e1 100644
--- 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;
     }