Implement 'Available via Passpoint' feature [DO NOT MERGE]

This also fixes the issues related to explicit connection
to passpoint AP, and fixes occassional mention of
'connected via Wi-Fi Assistent'

Change-Id: I152cebafa6259194f1d09a6972a3508156335cb6
(cherry picked from commit 08b5b5d439)
This commit is contained in:
Vinit Deshpande
2015-04-16 11:41:39 -07:00
parent 2add7d0d05
commit a2fd307651
5 changed files with 27 additions and 12 deletions

View File

@@ -156,7 +156,7 @@ public class WifiSettings extends RestrictedSettingsFragment
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
mWifiTracker = new WifiTracker(getActivity(), this, true, true);
mWifiTracker = new WifiTracker(getActivity(), this, true, true, false);
mWifiManager = mWifiTracker.getManager();
mConnectListener = new WifiManager.ActionListener() {
@@ -629,7 +629,7 @@ public class WifiSettings extends RestrictedSettingsFragment
if (accessPoint.getLevel() != -1) {
hasAvailableAccessPoints = true;
AccessPointPreference preference = new AccessPointPreference(accessPoint,
getActivity());
getActivity(), false);
getPreferenceScreen().addPreference(preference);
accessPoint.setListener(this);
@@ -891,7 +891,7 @@ public class WifiSettings extends RestrictedSettingsFragment
// Add saved Wi-Fi access points
final Collection<AccessPoint> accessPoints =
WifiTracker.getCurrentAccessPoints(context, true, false);
WifiTracker.getCurrentAccessPoints(context, true, false, false);
for (AccessPoint accessPoint : accessPoints) {
data = new SearchIndexableRaw(context);
data.title = accessPoint.getSsid();