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
This commit is contained in:
TreeHugger Robot
2017-03-29 21:00:55 +00:00
committed by Android (Google) Code Review
parent 258e8a8117 b19b8f37c9
commit 31170fb629
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) { if (mSelectedAccessPoint == null) {
return false; return false;
} }
/** Bypass dialog for unsecured, unsaved, and inactive networks */ if (mSelectedAccessPoint.isActive()) {
if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE && return super.onPreferenceTreeClick(preference);
!mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) { }
/** Bypass dialog and connect to unsecured or previously connected saved networks. */
WifiConfiguration config = mSelectedAccessPoint.getConfig();
if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) {
mSelectedAccessPoint.generateOpenNetworkConfig(); mSelectedAccessPoint.generateOpenNetworkConfig();
connect(mSelectedAccessPoint.getConfig(), false /* isSavedNetwork */); connect(mSelectedAccessPoint.getConfig(), mSelectedAccessPoint.isSaved());
} else if (mSelectedAccessPoint.isSaved()) { } else if (mSelectedAccessPoint.isSaved() && config != null
showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_VIEW); && config.getNetworkSelectionStatus() != null
&& config.getNetworkSelectionStatus().getHasEverConnected()) {
connect(config, true /* isSavedNetwork */);
} else { } else {
showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT); showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT);
} }