Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev

2015-07-11 01:46:31 +00:00
parent d374c20fc9 194cce695b
commit 233bd3ceff
1 changed files with 2 additions and 1 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -293,7 +293,8 @@ 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);
+            return concise ? context.getString(R.string.wifi_security_short_eap) :
+                context.getString(R.string.wifi_security_eap);
        }
        switch(security) {
            case SECURITY_EAP: