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

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

Browse Source 
Merge commit '7805fa99ffce21bb9b016ffdd5375d331b9a8a54'

* commit '7805fa99ffce21bb9b016ffdd5375d331b9a8a54':
  Disconnect dock only if its connected.
This commit is contained in:
Jaikumar Ganesh
2010-10-16 08:52:36 -07:00
committed by Android Git Automerger
parent d8fff3dc92 7805fa99ff
commit cf7ef7cbd6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -719,10 +719,13 @@ 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.
int status = profileManager.getConnectionStatus(cachedDevice.getDevice());
if (SettingsBtStatus.isConnectionStatusConnected(status)) {
if (DEBUG) Log.d(TAG, "applyBtSettings - Disconnecting"); if (DEBUG) Log.d(TAG, "applyBtSettings - Disconnecting");
cachedDevice.disconnect(mProfiles[i]); cachedDevice.disconnect(mProfiles[i]);
} }
}
profileManager.setPreferred(device, mCheckedItems[i]); profileManager.setPreferred(device, mCheckedItems[i]);
if (DEBUG) { if (DEBUG) {
if (mCheckedItems[i] != profileManager.isPreferred(device)) { if (mCheckedItems[i] != profileManager.isPreferred(device)) {