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

Commit e2c1d504 authored by Vinit Deshpande's avatar Vinit Deshpande
Browse files

Fix automatic Wi-fi toggle 

It is happening because there previous view doesn't disconnect
itself from setting change; and then two views alternatively
enable/disable wifi.

Bug: 17157005

Change-Id: I42916a7bbd735960a26efbae670c9b927ec8574d
parent 13fbd848

src/com/android/settings/wifi/WifiEnabler.java

+21 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import java.util.concurrent.atomic.AtomicBoolean; 
public class WifiEnabler implements SwitchBar.OnSwitchChangeListener  {

    private Context mContext;

    private SwitchBar mSwitchBar;

    private boolean mListeningToOnSwitchChange = false;

    private AtomicBoolean mConnected = new AtomicBoolean(false);



    private final WifiManager mWifiManager;
@@ -99,23 +100,41 @@ public class WifiEnabler implements SwitchBar.OnSwitchChangeListener { 
    public void setupSwitchBar() {

        final int state = mWifiManager.getWifiState();

        handleWifiStateChanged(state);

        if (!mListeningToOnSwitchChange) {

            mSwitchBar.addOnSwitchChangeListener(this);

            mListeningToOnSwitchChange = true;

        }

        mSwitchBar.show();



        mContext.registerReceiver(mReceiver, mIntentFilter);

    }



    public void teardownSwitchBar() {

        if (mListeningToOnSwitchChange) {

            mSwitchBar.removeOnSwitchChangeListener(this);

            mListeningToOnSwitchChange = false;

        }

        mSwitchBar.hide();



        mContext.unregisterReceiver(mReceiver);

    }



    public void resume(Context context) {

        mContext = context;

        // Wi-Fi state is sticky, so just let the receiver update UI

        mContext.registerReceiver(mReceiver, mIntentFilter);

        if (!mListeningToOnSwitchChange) {

            mSwitchBar.addOnSwitchChangeListener(this);

            mListeningToOnSwitchChange = true;

        }

    }



    public void pause() {

        mContext.unregisterReceiver(mReceiver);

        if (mListeningToOnSwitchChange) {

            mSwitchBar.removeOnSwitchChangeListener(this);

            mListeningToOnSwitchChange = false;

        }

    }



    private void handleWifiStateChanged(int state) {