diff options
author | Jaikumar Ganesh <jaikumar@google.com> | 2009-12-10 17:59:14 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-10 17:59:14 -0800 |
commit | 3681cfb83b0e9d02c71330fda25edaaf17bb0ba6 (patch) | |
tree | dc33684c9d9fc7e01bd0ade2bad797c1c39eb96f /src/com/android/settings/bluetooth | |
parent | 175821f978eda0d16c4406e209a395130864d178 (diff) | |
parent | 613549a622eac8278c9f81a1df83484c256652bf (diff) | |
download | packages_apps_settings-3681cfb83b0e9d02c71330fda25edaaf17bb0ba6.zip packages_apps_settings-3681cfb83b0e9d02c71330fda25edaaf17bb0ba6.tar.gz packages_apps_settings-3681cfb83b0e9d02c71330fda25edaaf17bb0ba6.tar.bz2 |
am 613549a6: Merge change I2c3621d1 into eclair
Merge commit '613549a622eac8278c9f81a1df83484c256652bf' into eclair-mr2
* commit '613549a622eac8278c9f81a1df83484c256652bf':
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 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(); + } } } |