summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorzhangshuxiao <zhangshuxiao@xiaomi.com>2016-08-10 20:03:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-08-10 20:03:44 +0000
commit171eee1ff5730e54411e17b9ca702a01ac561523 (patch)
tree9e04a2a710d886320384069d7e8413ac75ae4138 /service
parentd81fcbc2cdfbbac61d62198a800c395b19ccdeab (diff)
parentebfe1fbec6d52e10b9dbe532b969782edb7e21f2 (diff)
Merge "Don't log identity in to bugreport" am: 2cc6820c70
am: ebfe1fbec6 Change-Id: Id7a6d8317c8d7fc3aea5e5ae43566ecacefe07fa
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiNative.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index f268f62f6..ab1b8cf82 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -423,7 +423,9 @@ public class WifiNative {
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);