Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve passpoint configuration validation

Browse Source 
Change-Id: I717242b2f8b2e7d0f84c3a7c74c4672289387151
This commit is contained in:
Vinit Deshpande
2015-03-11 17:43:04 -07:00
parent 29cb944bef
commit 04444427d0
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -926,13 +926,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;
}
}