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

b/2238546 Fixed NPE in Settings when Bluetooth "class" is null

Browse Source
This commit is contained in:
Michael Chan
2009-11-04 17:19:48 -08:00
parent 9d6be2baf5
commit 4d004e9107
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -616,6 +616,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
} }
public int getBtClassDrawable() { public int getBtClassDrawable() {
if (mBtClass != null) {
switch (mBtClass.getMajorDeviceClass()) { switch (mBtClass.getMajorDeviceClass()) {
case BluetoothClass.Device.Major.COMPUTER: case BluetoothClass.Device.Major.COMPUTER:
return R.drawable.ic_bt_laptop; return R.drawable.ic_bt_laptop;
@@ -623,6 +624,9 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
case BluetoothClass.Device.Major.PHONE: case BluetoothClass.Device.Major.PHONE:
return R.drawable.ic_bt_cellphone; return R.drawable.ic_bt_cellphone;
} }
} else {
Log.w(TAG, "mBtClass is null");
}
if (mProfiles.size() > 0) { if (mProfiles.size() > 0) {
if (mProfiles.contains(Profile.A2DP)) { if (mProfiles.contains(Profile.A2DP)) {
@@ -630,7 +634,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
} else if (mProfiles.contains(Profile.HEADSET)) { } else if (mProfiles.contains(Profile.HEADSET)) {
return R.drawable.ic_bt_headset_hfp; return R.drawable.ic_bt_headset_hfp;
} }
} else { } else if (mBtClass != null) {
if (mBtClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) { if (mBtClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
return R.drawable.ic_bt_headphones_a2dp; return R.drawable.ic_bt_headphones_a2dp;