am beaae836: am 6c5b27e0: Merge "Fix opening secured networks from QS" into mnc-dev

* commit 'beaae8367ad41ff20ada95e621e488384b1730e3':
  Fix opening secured networks from QS
This commit is contained in:
Jason Monk
2015-06-18 19:37:34 +00:00
committed by Android Git Automerger

View File

@@ -650,7 +650,7 @@ public class WifiSettings extends RestrictedSettingsFragment
AccessPointPreference preference = new AccessPointPreference(accessPoint,
getActivity(), false);
if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsid())
if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsidStr())
&& !accessPoint.isSaved()
&& accessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
onPreferenceTreeClick(getPreferenceScreen(), preference);