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

Connect to network while clicking open or saved networks on slice

Browse Source 
Test: make RunSettingsRoboTests -j
Fixes: 121342770
Change-Id: I0ffb925628dd271d054f990b9b176eb10372e6a3
This commit is contained in:
Jason Chiu
2019-01-29 17:13:28 +08:00
parent e56df8877a
commit da2ca2f092
6 changed files with 237 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,24 +562,24 @@ public class WifiSettings extends RestrictedSettingsFragment
* Bypass dialog and connect to unsecured networks, or previously connected saved
* networks, or Passpoint provided networks.
*/
WifiConfiguration config = mSelectedAccessPoint.getConfig();
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());
} else if (mSelectedAccessPoint.isSaved() && config != null
&& 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);
switch (WifiUtils.getConnectingType(mSelectedAccessPoint)) {
case WifiUtils.CONNECT_TYPE_OSU_PROVISION:
mSelectedAccessPoint.startOsuProvisioning();
mClickedConnect = true;
break;
case WifiUtils.CONNECT_TYPE_OPEN_NETWORK:
mSelectedAccessPoint.generateOpenNetworkConfig();
connect(mSelectedAccessPoint.getConfig(), mSelectedAccessPoint.isSaved());
break;
case WifiUtils.CONNECT_TYPE_SAVED_NETWORK:
connect(mSelectedAccessPoint.getConfig(), true /* isSavedNetwork */);
break;
default:
showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT);
break;
}
} else if (preference == mAddPreference) {
onAddNetworkPressed();