diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-10 02:44:12 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-10 02:44:12 -0800 |
commit | 613549a622eac8278c9f81a1df83484c256652bf (patch) | |
tree | 5ffe2b1806ecd296b148fbecd9dbd31cb0ef4511 /src/com/android/settings/bluetooth | |
parent | d1469da150f44415135d657d57592f066670b317 (diff) | |
parent | b172cd5d232bd650d6efbb7d8b5e4cf9c213952f (diff) | |
download | packages_apps_settings-613549a622eac8278c9f81a1df83484c256652bf.zip packages_apps_settings-613549a622eac8278c9f81a1df83484c256652bf.tar.gz packages_apps_settings-613549a622eac8278c9f81a1df83484c256652bf.tar.bz2 |
Merge change I2c3621d1 into eclair
* changes:
Fix desk dock getting stuck after unpairing.
Diffstat (limited to 'src/com/android/settings/bluetooth')
-rw-r--r-- | src/com/android/settings/bluetooth/CachedBluetoothDevice.java | 6 | ||||
-rw-r--r-- | src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java | 6 |
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 53c1253..ca72d8a 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(); + } } } |