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

Merge "Use the ephemeral flag in the AccessPoint to mark a connection as a Wifi Assistant connection." into mnc-dev

Browse Source
This commit is contained in:
Shirish Kalele
2015-06-26 21:34:22 +00:00
committed by Android (Google) Code Review
parent 8dc38d96ba 1bcf050bf0
commit 8ac57a16cd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/WifiConfigController.java
View File

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