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

am 02f0a4af: Fix connecting to secure wifi from QS

Browse Source 
* commit '02f0a4aff3349513e69ea6697151c60088f75dcd':
  Fix connecting to secure wifi from QS
This commit is contained in:
Jason Monk
2015-05-13 15:12:35 +00:00
committed by Android Git Automerger
parent f76b732c18 02f0a4aff3
commit 417c9b4625
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,6 +147,7 @@ public class WifiSettings extends RestrictedSettingsFragment
private Bundle mWifiNfcDialogSavedState; private Bundle mWifiNfcDialogSavedState;
private WifiTracker mWifiTracker; private WifiTracker mWifiTracker;
private String mOpenSsid;
/* End of "used in Wifi Setup context" */ /* End of "used in Wifi Setup context" */
@@ -252,20 +253,8 @@ public class WifiSettings extends RestrictedSettingsFragment
setHasOptionsMenu(true); setHasOptionsMenu(true);
if (intent.hasExtra(EXTRA_START_CONNECT_SSID)) { if (intent.hasExtra(EXTRA_START_CONNECT_SSID)) {
String ssid = intent.getStringExtra(EXTRA_START_CONNECT_SSID); mOpenSsid = intent.getStringExtra(EXTRA_START_CONNECT_SSID);
onAccessPointsChanged(); onAccessPointsChanged();
PreferenceScreen preferenceScreen = getPreferenceScreen();
for (int i = 0; i < preferenceScreen.getPreferenceCount(); i++) {
Preference preference = preferenceScreen.getPreference(i);
if (preference instanceof AccessPointPreference) {
AccessPoint accessPoint = ((AccessPointPreference) preference).getAccessPoint();
if (ssid.equals(accessPoint.getSsid()) && !accessPoint.isSaved()
&& accessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
onPreferenceTreeClick(preferenceScreen, preference);
break;
}
}
}
} }
} }
@@ -642,6 +631,12 @@ public class WifiSettings extends RestrictedSettingsFragment
AccessPointPreference preference = new AccessPointPreference(accessPoint, AccessPointPreference preference = new AccessPointPreference(accessPoint,
getActivity(), false); getActivity(), false);
if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsid())
&& !accessPoint.isSaved()
&& accessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
onPreferenceTreeClick(getPreferenceScreen(), preference);
mOpenSsid = null;
}
getPreferenceScreen().addPreference(preference); getPreferenceScreen().addPreference(preference);
accessPoint.setListener(this); accessPoint.setListener(this);
} }