Merge "Use the ephemeral flag in the AccessPoint to mark a connection as a Wifi Assistant connection." into mnc-dev
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 1742c16..bc5f308 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -254,14 +254,14 @@
mConfigUi.setSubmitButton(res.getString(R.string.wifi_connect));
} else {
if (state != null) {
+ boolean isEphemeral = mAccessPoint.isEphemeral();
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);
+ mConfigUi.getContext(), state, isEphemeral, providerFriendlyName);
addRow(group, R.string.wifi_status, summary);
}