From 55271d454881b67ff38485fdd97598c542cc2d55 Mon Sep 17 00:00:00 2001 From: Paul Stewart Date: Wed, 11 Nov 2015 10:23:43 -0800 Subject: WifiEnterpriseConfiguration: Do not print credentials in toString BUG:25624963 Change-Id: I939a12a27d6b915d8a9cc8b142f645fba0ee42ec --- wifi/java/android/net/wifi/WifiEnterpriseConfig.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'wifi') diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java index 59b22bd..16035ad 100644 --- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java +++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java @@ -768,7 +768,9 @@ public class WifiEnterpriseConfig implements Parcelable { public String toString() { StringBuffer sb = new StringBuffer(); for (String key : mFields.keySet()) { - sb.append(key).append(" ").append(mFields.get(key)).append("\n"); + // Don't display password in toString(). + String value = (key == PASSWORD_KEY) ? "" : mFields.get(key); + sb.append(key).append(" ").append(value).append("\n"); } return sb.toString(); } -- cgit v1.1 From 81be4e3aac55305cbb5c9d523cf5c96c66604b39 Mon Sep 17 00:00:00 2001 From: Paul Stewart Date: Mon, 21 Mar 2016 09:51:27 -0700 Subject: Fix string equality comparison Don't use "==" to compare strings. Bug: 25624963 Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c --- wifi/java/android/net/wifi/WifiEnterpriseConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wifi') diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java index 16035ad..a337755 100644 --- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java +++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java @@ -769,7 +769,7 @@ public class WifiEnterpriseConfig implements Parcelable { StringBuffer sb = new StringBuffer(); for (String key : mFields.keySet()) { // Don't display password in toString(). - String value = (key == PASSWORD_KEY) ? "" : mFields.get(key); + String value = PASSWORD_KEY.equals(key) ? "" : mFields.get(key); sb.append(key).append(" ").append(value).append("\n"); } return sb.toString(); -- cgit v1.1