Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38b792be authored by Tomoharu Hatano's avatar Tomoharu Hatano Committed by android-build-merger
Browse files

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

am: 5af90f9f

Change-Id: I1cb9fabb9d3308312962305b6eb5d22314eb49a5
parents e022fa6a 5af90f9f

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }