diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-07-13 22:30:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 22:30:37 +0000 |
| commit | 0a66123f62f5d28bbef4f88a32c6de97caab3cfe (patch) | |
| tree | 7a92fe462c9754251fd3c674254644b753b8da60 /packages/SettingsLib | |
| parent | dc445a115fb93d3b6c900cd823032f340cc3cd56 (diff) | |
| parent | 233bd3ceffbe247b5230f2832ad63c6cf1d9ed13 (diff) | |
| download | frameworks_base-0a66123f62f5d28bbef4f88a32c6de97caab3cfe.zip frameworks_base-0a66123f62f5d28bbef4f88a32c6de97caab3cfe.tar.gz frameworks_base-0a66123f62f5d28bbef4f88a32c6de97caab3cfe.tar.bz2 | |
am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev
* commit '233bd3ceffbe247b5230f2832ad63c6cf1d9ed13':
Changes security for Passpoint to EAP security from "Passpoint".
Diffstat (limited to 'packages/SettingsLib')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 9325246..048fb9a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -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: |