diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-02-05 22:38:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-05 22:38:41 +0000 |
| commit | fe44cf45d4c6997461d0f4881daa44f24363bd2c (patch) | |
| tree | 14a28cba42198aa633a0cbe833c8db251ba69dd3 /service/java/com/android/server/wifi/WifiConfigManager.java | |
| parent | c08cad95aa5559d849820136d6ba0606d6698419 (diff) | |
| parent | 4e45fd9302b4ed943732ad85c0a88c7d7830be1d (diff) | |
| download | android_frameworks_opt_net_wifi-fe44cf45d4c6997461d0f4881daa44f24363bd2c.tar.gz android_frameworks_opt_net_wifi-fe44cf45d4c6997461d0f4881daa44f24363bd2c.tar.bz2 android_frameworks_opt_net_wifi-fe44cf45d4c6997461d0f4881daa44f24363bd2c.zip | |
Merge "TelephonyUtil changes to support Carrier Wifi."
Diffstat (limited to 'service/java/com/android/server/wifi/WifiConfigManager.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 9 |
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 4d26f39d8..efadbd064 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -44,6 +44,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; @@ -2427,13 +2428,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(""); } |