WifiEnterpriseConfiguration: Do not print credentials in toString

pstew-dd · gitbuildkicker · commit 55271d454881 · 2016-07-21T17:34:48.000-07:00
BUG:25624963
Change-Id: I939a12a27d6b915d8a9cc8b142f645fba0ee42ec
diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
@@ -768,7 +768,9 @@ public void setFieldValue(String key, String value) {
     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) ? "<removed>" : mFields.get(key);
+            sb.append(key).append(" ").append(value).append("\n");
         }
         return sb.toString();
     }

Original file line number	Diff line number	Diff line change
`@@ -768,7 +768,9 @@ public void setFieldValue(String key, String value) {`
`768`	`768`	`public String toString() {`
`769`	`769`	`StringBuffer sb = new StringBuffer();`
`770`	`770`	`for (String key : mFields.keySet()) {`
`771`		`- sb.append(key).append(" ").append(mFields.get(key)).append("\n");`
	`771`	`+ // Don't display password in toString().`
	`772`	`+ String value = (key == PASSWORD_KEY) ? "<removed>" : mFields.get(key);`
	`773`	`+ sb.append(key).append(" ").append(value).append("\n");`
`772`	`774`	`}`
`773`	`775`	`return sb.toString();`
`774`	`776`	`}`