PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* changes:
  Added autoscroll to top when clicking on OSU entry
  Added support for OSU Provider provisioning action on click
This commit is contained in:
Quang Luong
2019-01-16 19:10:14 +00:00
committed by Android (Google) Code Review
parent 2a38d79137 d3ba94b332
commit 3eac2faa9c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -563,7 +563,10 @@ public class WifiSettings extends RestrictedSettingsFragment
* networks, or Passpoint provided networks. * networks, or Passpoint provided networks.
*/ */
WifiConfiguration config = mSelectedAccessPoint.getConfig(); 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.getSecurity() == AccessPoint.SECURITY_OWE)) {
mSelectedAccessPoint.generateOpenNetworkConfig(); mSelectedAccessPoint.generateOpenNetworkConfig();
connect(mSelectedAccessPoint.getConfig(), mSelectedAccessPoint.isSaved()); connect(mSelectedAccessPoint.getConfig(), mSelectedAccessPoint.isSaved());