[Carrier Wi-Fi] Reset config identity on reboot or SIM in/out

For Carrier Wi-Fi configurations reset the complete configuration
identity - not just the anonymous identity. This will ensure that
the encrypted identity is queried for and used for the EAP-SIM
negotiations.

Bug: 118818180
Test: atest frameworks/opt/net/wifi/tests/wifitests
Test: integration/sanity testing passes on pi-dev, ref: b/119678669
Change-Id: I4ebf85a524473bf28ce2245b1e85ed933ba208c2

1 files changed, 10 insertions, 2 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 48ba44a82..a145fde47 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -2620,14 +2620,22 @@ public class WifiConfigManager {
                     Pair<String, String> currentIdentity =
                             TelephonyUtil.getSimIdentity(mTelephonyManager,
                                     new TelephonyUtil(), config);
+                    if (mVerboseLoggingEnabled) {
+                        Log.d(TAG, "New identity for config " + config + ": " + currentIdentity);
+                    }
 
                     // Update the loaded config
                     if (currentIdentity == null) {
                         Log.d(TAG, "Identity is null");
                         break;
                     }
-                    config.enterpriseConfig.setIdentity(currentIdentity.first);
-                    if (config.enterpriseConfig.getEapMethod() != WifiEnterpriseConfig.Eap.PEAP) {
+                    if (config.enterpriseConfig.getEapMethod() == WifiEnterpriseConfig.Eap.PEAP) {
+                        config.enterpriseConfig.setIdentity(currentIdentity.first);
+                        // do not reset anonymous identity since it may be dependent on user-entry
+                        // (i.e. cannot re-request on every reboot/SIM re-entry)
+                    } else {
+                        // reset identity as well: supplicant will ask us for it
+                        config.enterpriseConfig.setIdentity("");
                         config.enterpriseConfig.setAnonymousIdentity("");
                     }
                 }