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

Commit ebaefec7 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Fix Bluetooth QS tile. 

Changes in the connection state were causing QuickSettings
to clobber the enabled state of the adapter.

Bug: 7365388
Change-Id: I9611cb492d143bc9e7246c3e210664705586a85d
parent 91ffeddb

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java

+6 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ class QuickSettings { 
        IntentFilter filter = new IntentFilter();

        filter.addAction(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED);

        filter.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED);

        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);

        filter.addAction(Intent.ACTION_USER_SWITCHED);

        mContext.registerReceiver(mReceiver, filter);
@@ -854,6 +855,11 @@ class QuickSettings { 
                        DisplayManager.EXTRA_WIFI_DISPLAY_STATUS);

                mWifiDisplayStatus = status;

                applyWifiDisplayStatus();

            } else if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(action)) {

                int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,

                        BluetoothAdapter.ERROR);

                mBluetoothState.enabled = (state == BluetoothAdapter.STATE_ON);

                applyBluetoothStatus();

            } else if (BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED.equals(action)) {

                int status = intent.getIntExtra(BluetoothAdapter.EXTRA_CONNECTION_STATE,

                        BluetoothAdapter.STATE_DISCONNECTED);