Merge "wifi: allow manual connection to a Passpoint provided network" into oc-dev (248c0400) · Commits · e / os / android_packages_apps_Settings

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -516,7 +516,10 @@ public class WifiSettings extends RestrictedSettingsFragment
		if (mSelectedAccessPoint.isActive()) {
		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();
		if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) {
		mSelectedAccessPoint.generateOpenNetworkConfig();
		@@ -525,6 +528,10 @@ public class WifiSettings extends RestrictedSettingsFragment
		&& config.getNetworkSelectionStatus() != null
		&& config.getNetworkSelectionStatus().getHasEverConnected()) {
		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 {
		showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT);
		}