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

Merge "Connect immediately after pressing on previously connected saved networks." into oc-dev

Browse Source 
am: 31170fb629

Change-Id: Iee3dace687af34d3a1f75e9f201a38135c3f7997
This commit is contained in:
Stephen Chen
2017-03-29 21:06:55 +00:00
committed by android-build-merger
parent c5cc3ad8ab 31170fb629
commit 180810d00c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -513,13 +513,18 @@ public class WifiSettings extends RestrictedSettingsFragment
if (mSelectedAccessPoint == null) {
return false;
}
/** Bypass dialog for unsecured, unsaved, and inactive networks */
if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE &&
!mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) {
if (mSelectedAccessPoint.isActive()) {
return super.onPreferenceTreeClick(preference);
}
/** Bypass dialog and connect to unsecured or previously connected saved networks. */
WifiConfiguration config = mSelectedAccessPoint.getConfig();
if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) {
mSelectedAccessPoint.generateOpenNetworkConfig();
connect(mSelectedAccessPoint.getConfig(), false /* isSavedNetwork */);
} else if (mSelectedAccessPoint.isSaved()) {
showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_VIEW);
connect(mSelectedAccessPoint.getConfig(), mSelectedAccessPoint.isSaved());
} else if (mSelectedAccessPoint.isSaved() && config != null
&& config.getNetworkSelectionStatus() != null
&& config.getNetworkSelectionStatus().getHasEverConnected()) {
connect(config, true /* isSavedNetwork */);
} else {
showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT);
}