Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev

Browse Source
This commit is contained in:
Sanket Padawe
2015-07-11 01:46:31 +00:00
committed by Android (Google) Code Review
parent d374c20fc9 194cce695b
commit 233bd3ceff
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -293,7 +293,8 @@ public class AccessPoint implements Comparable<AccessPoint> {
public String getSecurityString(boolean concise) { public String getSecurityString(boolean concise) {
Context context = mContext; Context context = mContext;
if (mConfig != null && mConfig.isPasspoint()) { 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) { switch(security) {
case SECURITY_EAP: case SECURITY_EAP: