From cc00f4d646e4232d87ff5fafb17a4ec293797d90 Mon Sep 17 00:00:00 2001 From: Paul Stewart Date: Wed, 11 Nov 2015 10:23:43 -0800 Subject: [PATCH 1/2] 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(-) diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java index c7ebecb7e1eea..5e2f7d530c3ae 100644 --- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java +++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java @@ -837,7 +837,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(); } From 1033c6fdbc1b99f59418cbf42b9f13eb7ee0fc4e Mon Sep 17 00:00:00 2001 From: Paul Stewart Date: Mon, 21 Mar 2016 09:51:27 -0700 Subject: [PATCH 2/2] 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(-) diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java index 5e2f7d530c3ae..2b8ca48877d55 100644 --- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java +++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java @@ -838,7 +838,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();