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

Commit f5dea704 authored by Roman Birg's avatar Roman Birg Committed by André Rivotti Casimiro
Browse files

Settings: fix BT switch enabling discoverable mode 



Signed-off-by: default avatarRoman Birg <roman@cyngn.com>

Conflicts:
	src/com/android/settings/bluetooth/BluetoothEnabler.java

Bug: CYNGNOS-2271
Change-Id: I6b2dff88fb858d34a1b534705b2c67f5ab4c2d29
parent 5ec1a5fa

src/com/android/settings/bluetooth/BluetoothEnabler.java

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ public final class BluetoothEnabler extends GenericSwitchToggle { 
                setChecked(true);

                setEnabled(true);

                updateSearchIndex(true);

                mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);

                break;

            case BluetoothAdapter.STATE_TURNING_OFF:

                setEnabled(false);

src/com/android/settings/bluetooth/BluetoothSettings.java

+4 −0
Original line number Diff line number Diff line
@@ -227,6 +227,10 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem 
        if (mBluetoothEnabler != null) {

            mBluetoothEnabler.resume(getActivity());

        }

        if (mLocalAdapter != null) {

            // enable page and inquiry scan

            mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);

        }

        super.onResume();



        mInitiateDiscoverable = true;