diff options
| author | Roshan Pius <rpius@google.com> | 2018-09-11 07:48:03 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-09-11 07:48:03 -0700 |
| commit | f72b502c5450693c099cf9d2bfbb94a6f494eb6f (patch) | |
| tree | bd07810bf7fa191f41ce383c0529f3a6a6803456 /service | |
| parent | 3ed7278636a6c7abaa29a391dcded48e7a413b3f (diff) | |
| parent | 62b815af47b003833b7893e4ffc1fa3b985e8909 (diff) | |
Merge "Skip Anonymous Identity check in SIM/AKA/AKA' networks" am: 8affe3f819
am: 62b815af47
Change-Id: Iaa9ce377367c2745e913f6e737de54f65e44431e
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigurationUtil.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java index 8d94862e2..0258834ea 100644 --- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java +++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java @@ -28,6 +28,7 @@ import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.server.wifi.util.NativeUtil; +import com.android.server.wifi.util.TelephonyUtil; import java.nio.charset.StandardCharsets; import java.security.cert.X509Certificate; @@ -195,9 +196,12 @@ public class WifiConfigurationUtil { return true; } if (!TextUtils.equals(existingEnterpriseConfig.getIdentity(), - newEnterpriseConfig.getIdentity()) - || !TextUtils.equals(existingEnterpriseConfig.getAnonymousIdentity(), - newEnterpriseConfig.getAnonymousIdentity())) { + newEnterpriseConfig.getIdentity())) { + return true; + } + if (!TelephonyUtil.isSimEapMethod(existingEnterpriseConfig.getEapMethod()) + && !TextUtils.equals(existingEnterpriseConfig.getAnonymousIdentity(), + newEnterpriseConfig.getAnonymousIdentity())) { return true; } if (!TextUtils.equals(existingEnterpriseConfig.getPassword(), |