From 8038834f8e768f6a62b4c7d5498160eb2c8b4895 Mon Sep 17 00:00:00 2001 From: Jaikumar Ganesh Date: Tue, 1 Jun 2010 17:52:44 -0700 Subject: Changing disconnectHeadset calls. Change-Id: I2f058f28a09e983cd42e5a74bb4ffea19f07b880 --- .../android/settings/bluetooth/LocalBluetoothProfileManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java index 6179dc7..01714fe 100644 --- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java @@ -370,7 +370,10 @@ public abstract class LocalBluetoothProfileManager { public boolean connect(BluetoothDevice device) { // Since connectHeadset fails if already connected to a headset, we // disconnect from any headset first - mService.disconnectHeadset(); + BluetoothDevice currDevice = mService.getCurrentHeadset(); + if (currDevice != null) { + mService.disconnectHeadset(currDevice); + } return mService.connectHeadset(device); } @@ -381,7 +384,7 @@ public abstract class LocalBluetoothProfileManager { if (mService.getPriority(device) > BluetoothHeadset.PRIORITY_ON) { mService.setPriority(device, BluetoothHeadset.PRIORITY_ON); } - return mService.disconnectHeadset(); + return mService.disconnectHeadset(device); } else { return false; } @@ -391,7 +394,7 @@ public abstract class LocalBluetoothProfileManager { public int getConnectionStatus(BluetoothDevice device) { BluetoothDevice currentDevice = mService.getCurrentHeadset(); return currentDevice != null && currentDevice.equals(device) - ? convertState(mService.getState()) + ? convertState(mService.getState(device)) : SettingsBtStatus.CONNECTION_STATUS_DISCONNECTED; } -- cgit v1.1