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

am 9f1d9c16: Merge change I9a1ed7e4 into eclair

Browse Source 
Merge commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48' into eclair-plus-aosp

* commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48':
  Update to reflect new priorities for A2DP profile. DO NOT MERGE.
This commit is contained in:
Jaikumar Ganesh
2009-12-02 16:08:05 -08:00
committed by Android Git Automerger
parent d822820589 9f1d9c1688
commit 08ff9396f7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
View File

@@ -176,6 +176,8 @@ public abstract class LocalBluetoothProfileManager {
@Override
public boolean disconnect(BluetoothDevice device) {
// Downgrade priority as user is disconnecting the sink.
mService.setSinkPriority(device, BluetoothA2dp.PRIORITY_ON);
return mService.disconnectSink(device);
}
@@ -203,7 +205,7 @@ public abstract class LocalBluetoothProfileManager {
@Override
public void setPreferred(BluetoothDevice device, boolean preferred) {
mService.setSinkPriority(device,
preferred ? BluetoothA2dp.PRIORITY_AUTO : BluetoothA2dp.PRIORITY_OFF);
preferred ? BluetoothA2dp.PRIORITY_AUTO_CONNECT : BluetoothA2dp.PRIORITY_OFF);
}
@Override
@@ -269,6 +271,8 @@ public abstract class LocalBluetoothProfileManager {
@Override
public boolean disconnect(BluetoothDevice device) {
if (mService.getCurrentHeadset().equals(device)) {
// Downgrade prority as user is disconnecting the headset.
mService.setPriority(device, BluetoothHeadset.PRIORITY_ON);
return mService.disconnectHeadset();
} else {
return false;
@@ -302,7 +306,7 @@ public abstract class LocalBluetoothProfileManager {
@Override
public void setPreferred(BluetoothDevice device, boolean preferred) {
mService.setPriority(device,
preferred ? BluetoothHeadset.PRIORITY_AUTO : BluetoothHeadset.PRIORITY_OFF);
preferred ? BluetoothHeadset.PRIORITY_AUTO_CONNECT : BluetoothHeadset.PRIORITY_OFF);
}
@Override