diff options
author | Shirish Kalele <kalele@google.com> | 2015-06-26 21:34:22 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-26 21:34:37 +0000 |
commit | 8ac57a16cd42851e535f3914c8f5a7a516982f5c (patch) | |
tree | 35d91201666c83923c572e3c5147d507279a9bcd /src/com/android/settings/wifi | |
parent | 8dc38d96ba7070b63d1ba71f2cde2136be493952 (diff) | |
parent | 1bcf050bf08ae851ec2cb63ded528a2f4306082f (diff) | |
download | packages_apps_Settings-8ac57a16cd42851e535f3914c8f5a7a516982f5c.zip packages_apps_Settings-8ac57a16cd42851e535f3914c8f5a7a516982f5c.tar.gz packages_apps_Settings-8ac57a16cd42851e535f3914c8f5a7a516982f5c.tar.bz2 |
Merge "Use the ephemeral flag in the AccessPoint to mark a connection as a Wifi Assistant connection." into mnc-dev
Diffstat (limited to 'src/com/android/settings/wifi')
-rw-r--r-- | src/com/android/settings/wifi/WifiConfigController.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ public class WifiConfigController implements TextWatcher, 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); } |