summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangshuxiao <zhangshuxiao@xiaomi.com>2016-08-10 20:09:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-08-10 20:09:46 +0000
commit79d37587c4a79adec92c010fead953cf26cc2b30 (patch)
tree79f644ff8dd7cc1080f14315d6c01d031e83450a
parentc128ca137db16c1c2381f062fdbffb54f729106f (diff)
parent3bcaeb2eb09da72f0c253bc06f9e406c38457173 (diff)
Merge "Don't log identity in to bugreport" am: 2cc6820c70 am: ebfe1fbec6 am: 171eee1ff5
am: 3bcaeb2eb0 Change-Id: I99364614c64735f2311388786cabe266dc2dc91f
-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 b03046bbc..38d9f7760 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -390,7 +390,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);