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

Commit b19b8f37 authored by Stephen Chen's avatar Stephen Chen
Browse files

Connect immediately after pressing on previously connected saved networks. 

Bug: 34287193
Test: manual inspection
Change-Id: Idf7156fa48640a34ce11cbf2f9683cfc6525a7b5
parent a48cb8d9

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

+11 −6
Original line number Diff line number Diff line
@@ -513,13 +513,18 @@ public class WifiSettings extends RestrictedSettingsFragment 
            if (mSelectedAccessPoint == null) {

                return false;

            }

            /** Bypass dialog for unsecured, unsaved, and inactive networks */

            if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE &&

                    !mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) {

            if (mSelectedAccessPoint.isActive()) {

                return super.onPreferenceTreeClick(preference);

            }

            /** Bypass dialog and connect to unsecured or previously connected saved networks. */

            WifiConfiguration config = mSelectedAccessPoint.getConfig();

            if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) {

                mSelectedAccessPoint.generateOpenNetworkConfig();

                connect(mSelectedAccessPoint.getConfig(), false /* isSavedNetwork */);

            } else if (mSelectedAccessPoint.isSaved()) {

                showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_VIEW);

                connect(mSelectedAccessPoint.getConfig(), mSelectedAccessPoint.isSaved());

            } else if (mSelectedAccessPoint.isSaved() && config != null

                    && config.getNetworkSelectionStatus() != null

                    && config.getNetworkSelectionStatus().getHasEverConnected()) {

                connect(config, true /* isSavedNetwork */);

            } else {

                showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT);

            }