commit 022299dfce6a705a8cbaff972a4309da6e90a8c2
author Jaikumar Ganesh <jaikumar@google.com> Thu Oct 14 15:30:55 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 14 15:30:55 2010 -0700
tree 7728199d51092cfa6a46cced6efae32b6ab17b75
parent b5848295b346df619999458ad55ba8ce1f88bf4f
parent 9d03e98d22c51e81a01b2bdc91b825bd3b438481

Merge "Disconnect dock only if its connected." into gingerbread

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

diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java
index db24554..280ac92 100644
--- a/src/com/android/settings/bluetooth/DockService.java
+++ b/src/com/android/settings/bluetooth/DockService.java
@@ -718,9 +718,12 @@
                 // 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) {