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

am d55c31ea: am 4d004e91: b/2238546 Fixed NPE in Settings when Bluetooth "class" is null

Browse Source 
Merge commit 'd55c31ead6e52b215f42f351761483386ecacbc2' into eclair-mr2-plus-aosp

* commit 'd55c31ead6e52b215f42f351761483386ecacbc2':
  b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
This commit is contained in:
Michael Chan
2009-11-05 16:39:37 -08:00
committed by Android Git Automerger
parent 35a4c327a9 d55c31ead6
commit f69e5ad537
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -616,12 +616,16 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
}
public int getBtClassDrawable() {
switch (mBtClass.getMajorDeviceClass()) {
case BluetoothClass.Device.Major.COMPUTER:
return R.drawable.ic_bt_laptop;
if (mBtClass != null) {
switch (mBtClass.getMajorDeviceClass()) {
case BluetoothClass.Device.Major.COMPUTER:
return R.drawable.ic_bt_laptop;
case BluetoothClass.Device.Major.PHONE:
return R.drawable.ic_bt_cellphone;
case BluetoothClass.Device.Major.PHONE:
return R.drawable.ic_bt_cellphone;
}
} else {
Log.w(TAG, "mBtClass is null");
}
if (mProfiles.size() > 0) {
@@ -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;