am 1aeebabf: am 3681cfb8: am 613549a6: Merge change I2c3621d1 into eclair

Merge commit '1aeebabfd3753b264eed73d3448382ebda7426d5'

* commit '1aeebabfd3753b264eed73d3448382ebda7426d5':
  Fix desk dock getting stuck after unpairing.

2 files changed, 11 insertions, 1 deletions

diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
index 260cd8e..bb21bd7 100644
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/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) {
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
index c3dfc20..7906d79 100644
--- a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
@@ -186,7 +186,11 @@ public class CachedBluetoothDeviceManager {
 
         if (bondState == BluetoothDevice.BOND_BONDED) {
             // Auto-connect after pairing
-            cachedDevice.connect();
+            if (!device.isBluetoothDock()) {
+                cachedDevice.connect();
+            } else {
+                cachedDevice.onBondingDockConnect();
+            }
         }
     }