Merge "Show correct security type for PasspointConfiguration" into oc-mr1-dev

am: 5af90f9fc6 Change-Id: I1cb9fabb9d3308312962305b6eb5d22314eb49a5
2017-08-02 06:08:07 +00:00
parent e022fa6aae 5af90f9fc6
commit 38b792bed6
1 changed files with 1 additions and 1 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -604,7 +604,7 @@ public class AccessPoint implements Comparable<AccessPoint> {

    public String getSecurityString(boolean concise) {
        Context context = mContext;
-        if (mConfig != null && mConfig.isPasspoint()) {
+        if (isPasspoint() || isPasspointConfig()) {
            return concise ? context.getString(R.string.wifi_security_short_eap) :
                context.getString(R.string.wifi_security_eap);
        }