Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ada1f638: Merge "Reset priority on unbond" into jb-mr1-dev

Browse Source 
* commit 'ada1f638b67f47f1cfc88a89c150c2383fefcfff':
  Reset priority on unbond
This commit is contained in:
Matthew Xie
2012-07-26 21:17:45 -07:00
committed by Android Git Automerger
parent fb442580d7 ada1f638b6
commit 315dbccac4
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/bluetooth/BluetoothA2dp.java
View File

@@ -338,6 +338,7 @@ public final class BluetoothA2dp implements BluetoothProfile {
&& isValidDevice(device)) {
if (priority != BluetoothProfile.PRIORITY_OFF &&
priority != BluetoothProfile.PRIORITY_ON &&
priority != BluetoothProfile.PRIORITY_UNDEFINED &&
priority != BluetoothProfile.PRIORITY_AUTO_CONNECT) {
return false;
}

1
core/java/android/bluetooth/BluetoothHeadset.java
View File

@@ -456,6 +456,7 @@ public final class BluetoothHeadset implements BluetoothProfile {
isValidDevice(device)) {
if (priority != BluetoothProfile.PRIORITY_OFF &&
priority != BluetoothProfile.PRIORITY_ON &&
priority != BluetoothProfile.PRIORITY_UNDEFINED &&
priority != BluetoothProfile.PRIORITY_AUTO_CONNECT) {
return false;
}