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

Commit 3e7b412d authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

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

parents 0d9a41e7 564f16a8

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

+5 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public class BluetoothController extends BroadcastReceiver { 


    private int mIconId = R.drawable.stat_sys_data_bluetooth;

    private int mContentDescriptionId = 0;

    private boolean mEnabled;

    private boolean mEnabled = false;



    public BluetoothController(Context context) {

        mContext = context;
@@ -47,8 +47,10 @@ public class BluetoothController extends BroadcastReceiver { 
        context.registerReceiver(this, filter);



        final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        if (adapter != null) {

            handleAdapterStateChange(adapter.getState());

            handleConnectionStateChange(adapter.getConnectionState());

        }

        refreshViews();

    }