diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-07-14 00:20:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 00:20:55 +0000 |
| commit | cb9d3de03293210c76928934e04da5c4b73c833a (patch) | |
| tree | ce5409cf4e541e1c62bb89f5da0d06d17401c01c /packages/SettingsLib | |
| parent | 60e293cfed07ef32c16262435dc3d9092a7fb572 (diff) | |
| parent | f1a9868e18d1feb56434313701faaf52473f0942 (diff) | |
| download | frameworks_base-cb9d3de03293210c76928934e04da5c4b73c833a.zip frameworks_base-cb9d3de03293210c76928934e04da5c4b73c833a.tar.gz frameworks_base-cb9d3de03293210c76928934e04da5c4b73c833a.tar.bz2 | |
am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev
* commit 'f1a9868e18d1feb56434313701faaf52473f0942':
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: |