commit 0a0dad9923ad646de5051a87cbdad4d1efee3603
author Ningyuan Wang <nywang@google.com> Mon Apr 24 18:10:40 2017 -0700
committer Ningyuan Wang <nywang@google.com> Mon Apr 24 18:10:40 2017 -0700
tree d46e35991fe704eee01c34b4a8c3df62f5b2a165
parent d83e514cf7be395fce7d087c3a518e9f3154f89f

Do not reset anonymous identity for PEAP

Bug: 37492360
Test: compile, integration test
Change-Id: I9db7f7dfb7c78ab3dcb2261624f8caa01c457230

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

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index d9f3c1a..9020b8e 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -2334,7 +2334,9 @@
                 String currentIdentity = TelephonyUtil.getSimIdentity(mTelephonyManager, config);
                 // Update the loaded config
                 config.enterpriseConfig.setIdentity(currentIdentity);
-                config.enterpriseConfig.setAnonymousIdentity("");
+                if (config.enterpriseConfig.getEapMethod() != WifiEnterpriseConfig.Eap.PEAP) {
+                    config.enterpriseConfig.setAnonymousIdentity("");
+                }
             }
         }
     }