TelephonyUtil changes to support Carrier Wifi.

Changes to comply with spec. Also allows for passing both identies
back to the supplicant.

Bug: 30988281
Test: All the tests are passed
./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

OK (2261 tests)

Change-Id: I24cf85ba0c042f14682e512ccaa2677f065243f7

1 files changed, 7 insertions, 2 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index e443cd425..3ed87e040 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -43,6 +43,7 @@ import android.text.TextUtils;
 import android.util.ArraySet;
 import android.util.LocalLog;
 import android.util.Log;
+import android.util.Pair;
 
 import com.android.internal.R;
 import com.android.internal.annotations.VisibleForTesting;
@@ -2410,13 +2411,17 @@ public class WifiConfigManager {
         if (mVerboseLoggingEnabled) localLog("resetSimNetworks");
         for (WifiConfiguration config : getInternalConfiguredNetworks()) {
             if (TelephonyUtil.isSimConfig(config)) {
-                String currentIdentity = null;
+                Pair<String, String> currentIdentity = null;
                 if (simPresent) {
                     currentIdentity = TelephonyUtil.getSimIdentity(mTelephonyManager,
                         new TelephonyUtil(), config);
                 }
                 // Update the loaded config
-                config.enterpriseConfig.setIdentity(currentIdentity);
+                if (currentIdentity == null) {
+                    Log.d(TAG, "Identity is null");
+                    return;
+                }
+                config.enterpriseConfig.setIdentity(currentIdentity.first);
                 if (config.enterpriseConfig.getEapMethod() != WifiEnterpriseConfig.Eap.PEAP) {
                     config.enterpriseConfig.setAnonymousIdentity("");
                 }