diff options
| author | Jan Nordqvist <jannq@google.com> | 2015-03-19 17:09:08 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2015-03-19 17:09:10 +0000 |
| commit | 3105289af34b99bf27128a433663f71549b41b6d (patch) | |
| tree | 377baa41206f575e4ef902e197b6338f35a40e12 /wifi/java/android/net/wifi | |
| parent | 6c6fab231b9384c55625fe1ae044bf5ec106b115 (diff) | |
| parent | ad25bb89251c0552cfbc6c254853c79b7d9c121a (diff) | |
| download | frameworks_base-3105289af34b99bf27128a433663f71549b41b6d.zip frameworks_base-3105289af34b99bf27128a433663f71549b41b6d.tar.gz frameworks_base-3105289af34b99bf27128a433663f71549b41b6d.tar.bz2 | |
Merge "More fixes to get passpoint working" into m-wireless-dev
Diffstat (limited to 'wifi/java/android/net/wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 50beda7..34ae386 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -950,8 +950,7 @@ public class WifiConfiguration implements Parcelable { * Identify if this configuration represents a passpoint network */ public boolean isPasspoint() { - return TextUtils.isEmpty(SSID) - && !TextUtils.isEmpty(FQDN) + return !TextUtils.isEmpty(FQDN) && !TextUtils.isEmpty(providerFriendlyName) && enterpriseConfig != null && enterpriseConfig.getEapMethod() != WifiEnterpriseConfig.Eap.NONE; |