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

Commit cb9d3de0 authored by Sanket Padawe's avatar Sanket Padawe Committed by Android Git Automerger
Browse files

am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint... 

am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev

* commit 'f1a9868e':
  Changes security for Passpoint to EAP security from "Passpoint".
parents 60e293cf f1a9868e

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

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