summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-07-10 10:53:31 -0700
committerSanket Padawe <sanketpadawe@google.com>2015-07-10 10:53:31 -0700
commit194cce695b51604f6245a73cfec27631c7555429 (patch)
tree7994c513bd85418d6ca8e27c46817174d65b5bea
parentadebbebaa7d516628b5946dd023ff8726e75d2b0 (diff)
downloadframeworks_base-194cce695b51604f6245a73cfec27631c7555429.zip
frameworks_base-194cce695b51604f6245a73cfec27631c7555429.tar.gz
frameworks_base-194cce695b51604f6245a73cfec27631c7555429.tar.bz2
Changes security for Passpoint to EAP security from "Passpoint".
Bug: 22402754 Change-Id: I3afbb6f3f446657a3e9505122032f4edc6401302
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java3
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: