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

Commit 4a3d5b04 authored by Jesse Hall's avatar Jesse Hall Committed by Android Git Automerger
Browse files

am 2eb4a5ee: am 3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1 

* commit '2eb4a5ee':
  Fix statusbar crash on devices with no Bluetooth
parents 1c2bfd4a 2eb4a5ee

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();

    }