am 6e3ee10a: Fix auto connection of A2DP profile.

Merge commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5' into eclair-mr2

* commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5':
  Fix auto connection of A2DP profile.
This commit is contained in:
Jaikumar Ganesh
2009-12-10 17:56:44 -08:00
committed by Android Git Automerger

View File

@@ -214,8 +214,13 @@ public abstract class LocalBluetoothProfileManager {
@Override
public void setPreferred(BluetoothDevice device, boolean preferred) {
mService.setSinkPriority(device,
preferred ? BluetoothA2dp.PRIORITY_AUTO_CONNECT : BluetoothA2dp.PRIORITY_OFF);
if (preferred) {
if (mService.getSinkPriority(device) < BluetoothA2dp.PRIORITY_ON) {
mService.setSinkPriority(device, BluetoothA2dp.PRIORITY_ON);
}
} else {
mService.setSinkPriority(device, BluetoothA2dp.PRIORITY_OFF);
}
}
@Override
@@ -328,8 +333,13 @@ public abstract class LocalBluetoothProfileManager {
@Override
public void setPreferred(BluetoothDevice device, boolean preferred) {
mService.setPriority(device,
preferred ? BluetoothHeadset.PRIORITY_AUTO_CONNECT : BluetoothHeadset.PRIORITY_OFF);
if (preferred) {
if (mService.getPriority(device) < BluetoothHeadset.PRIORITY_ON) {
mService.setPriority(device, BluetoothHeadset.PRIORITY_ON);
}
} else {
mService.setPriority(device, BluetoothHeadset.PRIORITY_OFF);
}
}
@Override