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

Commit ea371385 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 

am: 38b792be

Change-Id: Ie5b2854bd9c3081dbcd4e405f7733abe3767e12a
parents 150889f6 38b792be

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

        }