PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 022299df: Merge "Disconnect dock only if its connected." into gingerbread

Browse Source 
Merge commit '022299dfce6a705a8cbaff972a4309da6e90a8c2' into gingerbread-plus-aosp

* commit '022299dfce6a705a8cbaff972a4309da6e90a8c2':
  Disconnect dock only if its connected.
This commit is contained in:
Jaikumar Ganesh
2010-10-14 15:33:42 -07:00
committed by Android Git Automerger
parent c915d16a90 022299dfce
commit 7805fa99ff
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/bluetooth/DockService.java
View File

@@ -718,9 +718,12 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli
// Checked but not connected // Checked but not connected
callConnect = true; callConnect = true;
} else if (!mCheckedItems[i]) { } else if (!mCheckedItems[i]) {
// Unchecked but connected // Unchecked, may or may not be connected.
if (DEBUG) Log.d(TAG, "applyBtSettings - Disconnecting"); int status = profileManager.getConnectionStatus(cachedDevice.getDevice());
cachedDevice.disconnect(mProfiles[i]); if (SettingsBtStatus.isConnectionStatusConnected(status)) {
if (DEBUG) Log.d(TAG, "applyBtSettings - Disconnecting");
cachedDevice.disconnect(mProfiles[i]);
}
} }
profileManager.setPreferred(device, mCheckedItems[i]); profileManager.setPreferred(device, mCheckedItems[i]);
if (DEBUG) { if (DEBUG) {