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

am 362d5b17: am bd0b2542: am a87f2fd7: b/2320107 Fixed NPE for class bits. Docks do not have class bits.

Browse Source 
Merge commit '362d5b17c0ff8f8f7207bbdec9c952d19c83b3be'

* commit '362d5b17c0ff8f8f7207bbdec9c952d19c83b3be':
  b/2320107 Fixed NPE for class bits. Docks do not have class bits.
This commit is contained in:
Michael Chan
2009-12-11 01:39:43 -08:00
committed by Android Git Automerger
parent 615e524561 362d5b17c0
commit 62698165f4
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,7 +332,10 @@ public class BluetoothSettings extends PreferenceActivity
if (uuids != null)
if (BluetoothUuid.containsAnyUuid(uuids,
LocalBluetoothProfileManager.OPP_PROFILE_UUIDS)) return true;
if (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) {
@@ -341,7 +344,7 @@ public class BluetoothSettings extends PreferenceActivity
if (BluetoothUuid.containsAnyUuid(uuids,
LocalBluetoothProfileManager.HEADSET_PROFILE_UUIDS)) return true;
} else {
} else if (bluetoothClass != null) {
if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) return true;
if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) return true;

4
src/com/android/settings/bluetooth/CachedBluetoothDevice.java
View File

@@ -691,6 +691,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
boolean printUuids = true;
BluetoothClass bluetoothClass = mDevice.getBluetoothClass();
if (bluetoothClass != null) {
if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET) !=
mProfiles.contains(Profile.HEADSET)) {
Log.v(TAG, "headset classbits != uuid");
@@ -708,9 +709,10 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
Log.v(TAG, "opp classbits != uuid");
printUuids = true;
}
}
if (printUuids) {
Log.v(TAG, "Class: " + bluetoothClass.toString());
if (bluetoothClass != null) Log.v(TAG, "Class: " + bluetoothClass.toString());
Log.v(TAG, "UUID:");
for (int i = 0; i < uuids.length; i++) {
Log.v(TAG, " " + uuids[i]);