diff options
Diffstat (limited to 'wifi/java/android/net/wifi/WifiConfiguration.java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 7e04f2b..11bdebb 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -973,13 +973,18 @@ public class WifiConfiguration implements Parcelable { } } - if (FQDN != null) { - /* must have a providerFriendlyName */ - if (providerFriendlyName == null) { + if (TextUtils.isEmpty(FQDN) == false) { + /* this is passpoint configuration; it must not have an SSID */ + if (TextUtils.isEmpty(SSID) == false) { + return false; + } + /* this is passpoint configuration; it must have a providerFriendlyName */ + if (TextUtils.isEmpty(providerFriendlyName)) { return false; } /* this is passpoint configuration; it must have enterprise config */ - if (enterpriseConfig == null) { + if (enterpriseConfig == null + || enterpriseConfig.getEapMethod() == WifiEnterpriseConfig.Eap.NONE ) { return false; } } @@ -989,6 +994,16 @@ public class WifiConfiguration implements Parcelable { } /** + * Identify if this configuration represents a passpoint network + */ + public boolean isPasspoint() { + return !TextUtils.isEmpty(FQDN) + && !TextUtils.isEmpty(providerFriendlyName) + && enterpriseConfig != null + && enterpriseConfig.getEapMethod() != WifiEnterpriseConfig.Eap.NONE; + } + + /** * Helper function, identify if a configuration is linked * @hide */ |