diff options
| author | Jan Nordqvist <jannq@google.com> | 2015-08-24 17:53:37 -0700 |
|---|---|---|
| committer | Jan Nordqvist <jannq@google.com> | 2015-08-24 17:53:37 -0700 |
| commit | 5f30066b5609002673289860cd1cdae49c5e83dc (patch) | |
| tree | c8678c962055d5bb3e070d647e2991e65941100d | |
| parent | 24d27d46ad357c27254b05c49ec33a210aca7436 (diff) | |
| download | wifi-5f30066b5609002673289860cd1cdae49c5e83dc.tar.gz | |
Moved domain suffix enforcement setting to WifiConfigStore.
Bug: 23359149
Change-Id: I2f66041e5125b1b032da54616b152cf6990c3bc8
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigStore.java | 1 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/configparse/ConfigBuilder.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java index d219531d3..56bb9c0ee 100644 --- a/service/java/com/android/server/wifi/WifiConfigStore.java +++ b/service/java/com/android/server/wifi/WifiConfigStore.java @@ -1279,6 +1279,7 @@ public class WifiConfigStore extends IpConfigStore { /* 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 d9259a3c6..e8e5e6a18 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 @@ public class ConfigBuilder { enterpriseConfig.setCaCertificate(caCert); enterpriseConfig.setAnonymousIdentity("anonymous@" + credential.getRealm()); enterpriseConfig.setRealm(credential.getRealm()); - enterpriseConfig.setDomainSuffixMatch(homeSP.getFQDN()); return config; } |