b/2238546 Fixed NPE in Settings when Bluetooth "class" is null (4d004e91) · Commits · e / os / android_packages_apps_Settings

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

+10 −6

Original line number	Diff line number	Diff line
		@@ -616,6 +616,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
		}

		public int getBtClassDrawable() {
		if (mBtClass != null) {
		switch (mBtClass.getMajorDeviceClass()) {
		case BluetoothClass.Device.Major.COMPUTER:
		return R.drawable.ic_bt_laptop;
		@@ -623,6 +624,9 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
		case BluetoothClass.Device.Major.PHONE:
		return R.drawable.ic_bt_cellphone;
		}
		} else {
		Log.w(TAG, "mBtClass is null");
		}

		if (mProfiles.size() > 0) {
		if (mProfiles.contains(Profile.A2DP)) {
		@@ -630,7 +634,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
		} else if (mProfiles.contains(Profile.HEADSET)) {
		return R.drawable.ic_bt_headset_hfp;
		}
		} else {
		} else if (mBtClass != null) {
		if (mBtClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
		return R.drawable.ic_bt_headphones_a2dp;