diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-10-16 08:52:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-16 08:52:36 -0700 |
| commit | cf7ef7cbd6f0165f21d779628dc61485820c305f (patch) | |
| tree | d7553645eb1e2c8f046aa8e71778cb46254e3458 /src/com/android/settings/bluetooth/DockService.java | |
| parent | d8fff3dc924c0d84be591776389f011f42fd270d (diff) | |
| parent | 7805fa99ffce21bb9b016ffdd5375d331b9a8a54 (diff) | |
| download | packages_apps_Settings-cf7ef7cbd6f0165f21d779628dc61485820c305f.zip packages_apps_Settings-cf7ef7cbd6f0165f21d779628dc61485820c305f.tar.gz packages_apps_Settings-cf7ef7cbd6f0165f21d779628dc61485820c305f.tar.bz2 | |
am 7805fa99: am 022299df: Merge "Disconnect dock only if its connected." into gingerbread
Merge commit '7805fa99ffce21bb9b016ffdd5375d331b9a8a54'
* commit '7805fa99ffce21bb9b016ffdd5375d331b9a8a54':
Disconnect dock only if its connected.
Diffstat (limited to 'src/com/android/settings/bluetooth/DockService.java')
| -rw-r--r-- | src/com/android/settings/bluetooth/DockService.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java index 47d4076..e817e78 100644 --- a/src/com/android/settings/bluetooth/DockService.java +++ b/src/com/android/settings/bluetooth/DockService.java @@ -719,9 +719,12 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli // Checked but not connected callConnect = true; } else if (!mCheckedItems[i]) { - // Unchecked but connected - if (DEBUG) Log.d(TAG, "applyBtSettings - Disconnecting"); - cachedDevice.disconnect(mProfiles[i]); + // Unchecked, may or may not be connected. + int status = profileManager.getConnectionStatus(cachedDevice.getDevice()); + if (SettingsBtStatus.isConnectionStatusConnected(status)) { + if (DEBUG) Log.d(TAG, "applyBtSettings - Disconnecting"); + cachedDevice.disconnect(mProfiles[i]); + } } profileManager.setPreferred(device, mCheckedItems[i]); if (DEBUG) { |