WifiEnterpriseConfiguration: Do not print credentials in toString

pstew-dd · andi34 · commit ac214f510fc0 · 2016-10-22T21:25:27.000+02:00
BUG:25624963
Change-Id: I939a12a27d6b915d8a9cc8b142f645fba0ee42ec
diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
@@ -837,7 +837,9 @@ private void setFieldValue(String key, String value, String prefix) {
     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
`@@ -837,7 +837,9 @@ private void setFieldValue(String key, String value, String prefix) {`
`837`	`837`	`public String toString() {`
`838`	`838`	`StringBuffer sb = new StringBuffer();`
`839`	`839`	`for (String key : mFields.keySet()) {`
`840`		`- sb.append(key).append(" ").append(mFields.get(key)).append("\n");`
	`840`	`+ // Don't display password in toString().`
	`841`	`+ String value = (key == PASSWORD_KEY) ? "<removed>" : mFields.get(key);`
	`842`	`+ sb.append(key).append(" ").append(value).append("\n");`
`841`	`843`	`}`
`842`	`844`	`return sb.toString();`
`843`	`845`	`}`