am 613549a6: Merge change I2c3621d1 into eclair

Merge commit '613549a622eac8278c9f81a1df83484c256652bf' into eclair-mr2

* commit '613549a622eac8278c9f81a1df83484c256652bf':
  Fix desk dock getting stuck after unpairing.

src/com/android/settings/bluetooth/CachedBluetoothDevice.java

@@ -383,6 +383,12 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
         connectWithoutResettingTimer();
     }
 
+    /*package*/ void onBondingDockConnect() {
+        // Don't connect just set the timer.
+        // TODO(): Fix the actual problem
+        mConnectAttempted = SystemClock.elapsedRealtime();
+    }
+
     private void connectWithoutResettingTimer() {
         // Try to initialize the profiles if there were not.
         if (mProfiles.size() == 0) {

src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java

@@ -186,7 +186,11 @@ public class CachedBluetoothDeviceManager {
 
         if (bondState == BluetoothDevice.BOND_BONDED) {
             // Auto-connect after pairing
+            if (!device.isBluetoothDock()) {
                 cachedDevice.connect();
+            } else {
+                cachedDevice.onBondingDockConnect();
+            }
         }
     }