commit 2cc6820c700a12d9ed9bda4d1ac0e199d388ca83
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 10 19:54:43 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 10 19:54:43 2016 +0000
tree 563e666419ae1d0ff96f39568704358848f15624
parent e66e9b84a7fa750382c618340c79f7ae641d355e
parent f20f5757ad97c9e2cf3920ff7e861358a576053b

Merge "Don't log identity in to bugreport"

service/java/com/android/server/wifi/WifiNative.java

diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index 7bdd17c..4e21d94 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -316,7 +316,9 @@
     public boolean setNetworkVariable(int netId, String name, String value) {
         if (TextUtils.isEmpty(name) || TextUtils.isEmpty(value)) return false;
         if (name.equals(WifiConfiguration.pskVarName)
-                || name.equals(WifiEnterpriseConfig.PASSWORD_KEY)) {
+                || name.equals(WifiEnterpriseConfig.PASSWORD_KEY)
+                || name.equals(WifiEnterpriseConfig.IDENTITY_KEY)
+                || name.equals(WifiEnterpriseConfig.ANON_IDENTITY_KEY)) {
             return doBooleanCommandWithoutLogging("SET_NETWORK " + netId + " " + name + " " + value);
         } else {
             return doBooleanCommand("SET_NETWORK " + netId + " " + name + " " + value);