Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1

Browse Source
This commit is contained in:
Jesse Hall
2011-12-05 21:23:29 -08:00
committed by Android (Google) Code Review
parent 0d9a41e74c 564f16a8d7
commit 3e7b412d7d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java
View File

@@ -36,7 +36,7 @@ public class BluetoothController extends BroadcastReceiver {
private int mIconId = R.drawable.stat_sys_data_bluetooth; private int mIconId = R.drawable.stat_sys_data_bluetooth;
private int mContentDescriptionId = 0; private int mContentDescriptionId = 0;
private boolean mEnabled; private boolean mEnabled = false;
public BluetoothController(Context context) { public BluetoothController(Context context) {
mContext = context; mContext = context;
@@ -47,8 +47,10 @@ public class BluetoothController extends BroadcastReceiver {
context.registerReceiver(this, filter); context.registerReceiver(this, filter);
final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
handleAdapterStateChange(adapter.getState()); if (adapter != null) {
handleConnectionStateChange(adapter.getConnectionState()); handleAdapterStateChange(adapter.getState());
handleConnectionStateChange(adapter.getConnectionState());
}
refreshViews(); refreshViews();
} }