Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f7ec324 authored by Michael Chan's avatar Michael Chan Committed by Android Git Automerger
Browse files

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

Merge commit 'a87f2fd7' into eclair-plus-aosp

* commit 'a87f2fd7':
  b/2320107 Fixed NPE for class bits. Docks do not have class bits.
parents 4e580673 a87f2fd7

src/com/android/settings/bluetooth/BluetoothSettings.java

+5 −2
Original line number Diff line number Diff line
@@ -326,7 +326,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) {
@@ -335,7 +338,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;

src/com/android/settings/bluetooth/CachedBluetoothDevice.java

+17 −15
Original line number Diff line number Diff line
@@ -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]);