Merge "Moved domain suffix enforcement setting to WifiConfigStore." into mnc-dev
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index 7416cd6..652899e 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -1279,6 +1279,7 @@
             /* create a temporary SSID with providerFriendlyName */
             Long csum = getChecksum(config.FQDN);
             config.SSID = csum.toString();
+            config.enterpriseConfig.setDomainSuffixMatch(config.FQDN);
         }
 
         NetworkUpdateResult result = addOrUpdateNetworkNative(config, uid);
diff --git a/service/java/com/android/server/wifi/configparse/ConfigBuilder.java b/service/java/com/android/server/wifi/configparse/ConfigBuilder.java
index d9259a3..e8e5e6a 100644
--- a/service/java/com/android/server/wifi/configparse/ConfigBuilder.java
+++ b/service/java/com/android/server/wifi/configparse/ConfigBuilder.java
@@ -203,7 +203,6 @@
         enterpriseConfig.setCaCertificate(caCert);
         enterpriseConfig.setAnonymousIdentity("anonymous@" + credential.getRealm());
         enterpriseConfig.setRealm(credential.getRealm());
-        enterpriseConfig.setDomainSuffixMatch(homeSP.getFQDN());
 
         return config;
     }