summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib/src/com/android/settingslib
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-05-12 10:27:19 -0700
committerSanket Padawe <sanketpadawe@google.com>2015-05-12 10:27:19 -0700
commitd187880109a614f677911c89cdc1cb034341de3d (patch)
tree4f25ea9ba4e935727a966527b2cd8058ec98a600 /packages/SettingsLib/src/com/android/settingslib
parentea4eb326cfc4a8221be5fdab9639d468c632aee2 (diff)
downloadframeworks_base-d187880109a614f677911c89cdc1cb034341de3d.zip
frameworks_base-d187880109a614f677911c89cdc1cb034341de3d.tar.gz
frameworks_base-d187880109a614f677911c89cdc1cb034341de3d.tar.bz2
Hotspot 2.0 UI.
Bug: 20182930 Change-Id: Ice6df509889fa7eb0494bb04af65890f07b4a2b1
Diffstat (limited to 'packages/SettingsLib/src/com/android/settingslib')
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
index 7eaa728..0a0630e 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -248,6 +248,9 @@ public class AccessPoint implements Comparable<AccessPoint> {
public String getSecurityString(boolean concise) {
Context context = mContext;
+ if (mConfig != null && mConfig.isPasspoint()) {
+ return context.getString(R.string.wifi_security_passpoint);
+ }
switch(security) {
case SECURITY_EAP:
return concise ? context.getString(R.string.wifi_security_short_eap) :