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

Merge "Changing disconnectHeadset calls." into kraken

Browse Source
This commit is contained in:
Jaikumar Ganesh
2010-06-07 14:12:01 -07:00
committed by Android (Google) Code Review
parent 728ac35373 8038834f8e
commit 68a5bd361d
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/LocalBluetoothProfileManager.java
View File

@@ -370,7 +370,10 @@ public abstract class LocalBluetoothProfileManager {
public boolean connect(BluetoothDevice device) { public boolean connect(BluetoothDevice device) {
// Since connectHeadset fails if already connected to a headset, we // Since connectHeadset fails if already connected to a headset, we
// disconnect from any headset first // disconnect from any headset first
mService.disconnectHeadset(); BluetoothDevice currDevice = mService.getCurrentHeadset();
if (currDevice != null) {
mService.disconnectHeadset(currDevice);
}
return mService.connectHeadset(device); return mService.connectHeadset(device);
} }
@@ -381,7 +384,7 @@ public abstract class LocalBluetoothProfileManager {
if (mService.getPriority(device) > BluetoothHeadset.PRIORITY_ON) { if (mService.getPriority(device) > BluetoothHeadset.PRIORITY_ON) {
mService.setPriority(device, BluetoothHeadset.PRIORITY_ON); mService.setPriority(device, BluetoothHeadset.PRIORITY_ON);
} }
return mService.disconnectHeadset(); return mService.disconnectHeadset(device);
} else { } else {
return false; return false;
} }
@@ -391,7 +394,7 @@ public abstract class LocalBluetoothProfileManager {
public int getConnectionStatus(BluetoothDevice device) { public int getConnectionStatus(BluetoothDevice device) {
BluetoothDevice currentDevice = mService.getCurrentHeadset(); BluetoothDevice currentDevice = mService.getCurrentHeadset();
return currentDevice != null && currentDevice.equals(device) return currentDevice != null && currentDevice.equals(device)
? convertState(mService.getState()) ? convertState(mService.getState(device))
: SettingsBtStatus.CONNECTION_STATUS_DISCONNECTED; : SettingsBtStatus.CONNECTION_STATUS_DISCONNECTED;
} }