diff options
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigurationUtil.java | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java index f37472ead..336d97810 100644 --- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java +++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java @@ -224,6 +224,11 @@ public class WifiConfigurationUtil { if (existingEnterpriseConfig.getEapMethod() != newEnterpriseConfig.getEapMethod()) { return true; } + if (existingEnterpriseConfig.isAuthenticationSimBased()) { + // No other credential changes for SIM based methods. + // The SIM card is the credential. + return false; + } if (existingEnterpriseConfig.getPhase2Method() != newEnterpriseConfig.getPhase2Method()) { return true; @@ -232,8 +237,7 @@ public class WifiConfigurationUtil { newEnterpriseConfig.getIdentity())) { return true; } - if (!existingEnterpriseConfig.isAuthenticationSimBased() - && !TextUtils.equals(existingEnterpriseConfig.getAnonymousIdentity(), + if (!TextUtils.equals(existingEnterpriseConfig.getAnonymousIdentity(), newEnterpriseConfig.getAnonymousIdentity())) { return true; } @@ -246,6 +250,21 @@ public class WifiConfigurationUtil { if (!Arrays.equals(existingCaCerts, newCaCerts)) { return true; } + if (!Arrays.equals(newEnterpriseConfig.getCaCertificateAliases(), + existingEnterpriseConfig.getCaCertificateAliases())) { + return true; + } + if (!TextUtils.equals(newEnterpriseConfig.getClientCertificateAlias(), + existingEnterpriseConfig.getClientCertificateAlias())) { + return true; + } + if (!TextUtils.equals(newEnterpriseConfig.getAltSubjectMatch(), + existingEnterpriseConfig.getAltSubjectMatch())) { + return true; + } + if (newEnterpriseConfig.getOcsp() != existingEnterpriseConfig.getOcsp()) { + return true; + } } else { // One of the configs may have an enterpriseConfig if (existingEnterpriseConfig != null || newEnterpriseConfig != null) { |