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

@@ -250,8 +250,15 @@ public class WifiConfigController implements TextWatcher,
mConfigUi.setSubmitButton(res.getString(R.string.wifi_connect));
} else {
if (state != null) {
addRow(group, R.string.wifi_status, AccessPoint.getSummary(
mConfigUi.getContext(), state, !mAccessPoint.isSaved()));
WifiConfiguration config = mAccessPoint.getConfig();
boolean isEphimeral = mAccessPoint.isSaved() == false;
String providerFriendlyName = null;
if (config != null && config.isPasspoint()) {
providerFriendlyName = config.providerFriendlyName;
}
String summary = AccessPoint.getSummary(
mConfigUi.getContext(), state, isEphimeral, providerFriendlyName);
addRow(group, R.string.wifi_status, summary);
}
if (signalLevel != null) {