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

Merge "Match devices by Class for tethering."

Browse Source
This commit is contained in:
Jaikumar Ganesh
2010-08-23 15:58:37 -07:00
committed by Android (Google) Code Review
parent 3784d003b8 8eb4986049
commit 42b0443212
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/bluetooth/BluetoothSettings.java
View File

@@ -337,9 +337,10 @@ public class BluetoothSettings extends PreferenceActivity
switch(mFilterType) { switch(mFilterType) {
case BluetoothDevicePicker.FILTER_TYPE_TRANSFER: case BluetoothDevicePicker.FILTER_TYPE_TRANSFER:
if (uuids != null) if (uuids != null) {
if (BluetoothUuid.containsAnyUuid(uuids, if (BluetoothUuid.containsAnyUuid(uuids,
LocalBluetoothProfileManager.OPP_PROFILE_UUIDS)) return true; LocalBluetoothProfileManager.OPP_PROFILE_UUIDS)) return true;
}
if (bluetoothClass != null if (bluetoothClass != null
&& bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_OPP)) { && bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_OPP)) {
return true; return true;
@@ -364,12 +365,20 @@ public class BluetoothSettings extends PreferenceActivity
LocalBluetoothProfileManager.PANU_PROFILE_UUIDS)) return true; LocalBluetoothProfileManager.PANU_PROFILE_UUIDS)) return true;
} }
if (bluetoothClass != null
&& bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_PANU)) {
return true;
}
break; break;
case BluetoothDevicePicker.FILTER_TYPE_NAP: case BluetoothDevicePicker.FILTER_TYPE_NAP:
if (uuids != null) { if (uuids != null) {
if (BluetoothUuid.containsAnyUuid(uuids, if (BluetoothUuid.containsAnyUuid(uuids,
LocalBluetoothProfileManager.NAP_PROFILE_UUIDS)) return true; LocalBluetoothProfileManager.NAP_PROFILE_UUIDS)) return true;
} }
if (bluetoothClass != null
&& bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_NAP)) {
return true;
}
break; break;
default: default:
return true; return true;