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

Commit 3eac2faa authored by Quang Luong's avatar Quang Luong Committed by Android (Google) Code Review
Browse files

Merge changes from topics "osu-at-the-top", "osu-provisioning-support" 

* changes:
  Added autoscroll to top when clicking on OSU entry
  Added support for OSU Provider provisioning action on click
parents 2a38d791 d3ba94b3

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

+4 −1
Original line number Diff line number Diff line
@@ -563,7 +563,10 @@ public class WifiSettings extends RestrictedSettingsFragment 
             * networks, or Passpoint provided networks.

             */

            WifiConfiguration config = mSelectedAccessPoint.getConfig();

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

            if (mSelectedAccessPoint.isOsuProvider()) {

                mSelectedAccessPoint.startOsuProvisioning();

                mClickedConnect = true;

            } else if ((mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) ||

                    (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) {

                mSelectedAccessPoint.generateOpenNetworkConfig();

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