summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2010-08-23 11:20:48 -0700
committerJaikumar Ganesh <jaikumar@google.com>2010-08-23 11:49:19 -0700
commit8eb4986049541c0e8de86190c0513d1895597438 (patch)
tree4488606aa3edb2552d948174b34b06703a289647 /src/com/android
parent2cd6aad5615af391e1b58db9faa9c9d76280d0b1 (diff)
downloadpackages_apps_Settings-8eb4986049541c0e8de86190c0513d1895597438.zip
packages_apps_Settings-8eb4986049541c0e8de86190c0513d1895597438.tar.gz
packages_apps_Settings-8eb4986049541c0e8de86190c0513d1895597438.tar.bz2
Match devices by Class for tethering.
Change-Id: I711de3c8d6f6b1dafeec4fb5dde4fa33d997bcca
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/bluetooth/BluetoothSettings.java19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 7f21cef..bb3cbc7 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -337,13 +337,14 @@ public class BluetoothSettings extends PreferenceActivity
switch(mFilterType) {
case BluetoothDevicePicker.FILTER_TYPE_TRANSFER:
- if (uuids != null)
+ if (uuids != null) {
if (BluetoothUuid.containsAnyUuid(uuids,
LocalBluetoothProfileManager.OPP_PROFILE_UUIDS)) return true;
- if (bluetoothClass != null
- && bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_OPP)) {
- return true;
- }
+ }
+ if (bluetoothClass != null
+ && bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_OPP)) {
+ return true;
+ }
break;
case BluetoothDevicePicker.FILTER_TYPE_AUDIO:
if (uuids != null) {
@@ -364,12 +365,20 @@ public class BluetoothSettings extends PreferenceActivity
LocalBluetoothProfileManager.PANU_PROFILE_UUIDS)) return true;
}
+ if (bluetoothClass != null
+ && bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_PANU)) {
+ return true;
+ }
break;
case BluetoothDevicePicker.FILTER_TYPE_NAP:
if (uuids != null) {
if (BluetoothUuid.containsAnyUuid(uuids,
LocalBluetoothProfileManager.NAP_PROFILE_UUIDS)) return true;
}
+ if (bluetoothClass != null
+ && bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_NAP)) {
+ return true;
+ }
break;
default:
return true;