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

Merge "wifi: allow manual connection to a Passpoint provided network" into oc-dev

Browse Source 
am: 248c04001e

Change-Id: I96798d7c1ad75210e0484e818ba3982b713a46f7
This commit is contained in:
Peter Qiu
2017-04-05 21:25:02 +00:00
committed by android-build-merger
parent 090b4e7e59 248c04001e
commit 9a5a4d881a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -516,7 +516,10 @@ public class WifiSettings extends RestrictedSettingsFragment
if (mSelectedAccessPoint.isActive()) { if (mSelectedAccessPoint.isActive()) {
return super.onPreferenceTreeClick(preference); return super.onPreferenceTreeClick(preference);
} }
/** Bypass dialog and connect to unsecured or previously connected saved networks. */ /**
* Bypass dialog and connect to unsecured networks, or previously connected saved
* networks, or Passpoint provided networks.
*/
WifiConfiguration config = mSelectedAccessPoint.getConfig(); WifiConfiguration config = mSelectedAccessPoint.getConfig();
if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) { if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) {
mSelectedAccessPoint.generateOpenNetworkConfig(); mSelectedAccessPoint.generateOpenNetworkConfig();
@@ -525,6 +528,10 @@ public class WifiSettings extends RestrictedSettingsFragment
&& config.getNetworkSelectionStatus() != null && config.getNetworkSelectionStatus() != null
&& config.getNetworkSelectionStatus().getHasEverConnected()) { && config.getNetworkSelectionStatus().getHasEverConnected()) {
connect(config, true /* isSavedNetwork */); connect(config, true /* isSavedNetwork */);
} else if (mSelectedAccessPoint.isPasspoint()) {
// Access point provided by an installed Passpoint provider, connect using
// the associated config.
connect(config, true /* isSavedNetwork */);
} else { } else {
showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT); showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT);
} }