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

This commit is contained in:
TreeHugger Robot
2017-08-02 06:01:04 +00:00
committed by Android (Google) Code Review

View File

@@ -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);
}