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

am d4928835: Cleaned out "isValid" from WifiConfig.

Browse Source 
* commit 'd49288352908e8cbc9a001e13df2eb35e78deb1a':
  Cleaned out "isValid" from WifiConfig.
This commit is contained in:
Jan Nordqvist
2015-06-03 05:21:12 +00:00
committed by Android Git Automerger
parent a07d0a8843 d492883529
commit 23cbc9d1a7
1 changed files with 2 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -918,60 +918,6 @@ public class WifiConfiguration implements Parcelable {
creatorUid = -1;
}
/**
* indicates whether the configuration is valid
* @return true if valid, false otherwise
* @hide
*/
public boolean isValid() {
String reason = strIsValid();
if (reason != null) {
Log.e(TAG, "WiFi Config not valid: " + reason);
return false;
}
else {
return true;
}
}
private String strIsValid() {
if (allowedKeyManagement == null)
return "allowed kmgmt";
if (allowedKeyManagement.cardinality() > 1) {
if (allowedKeyManagement.cardinality() != 2) {
return "cardinality != 2";
}
if (!allowedKeyManagement.get(KeyMgmt.WPA_EAP)) {
return "not WPA_EAP";
}
if ((!allowedKeyManagement.get(KeyMgmt.IEEE8021X))
&& (!allowedKeyManagement.get(KeyMgmt.WPA_PSK))) {
return "not PSK or 8021X";
}
}
if (!TextUtils.isEmpty(FQDN)) {
/* this is passpoint configuration; it must not have an SSID */
if (!TextUtils.isEmpty(SSID)) {
return "SSID not expected for Passpoint: '" + SSID + "'";
}
/* this is passpoint configuration; it must have a providerFriendlyName */
if (TextUtils.isEmpty(providerFriendlyName)) {
return "no provider friendly name";
}
/* this is passpoint configuration; it must have enterprise config */
if (enterpriseConfig == null
|| enterpriseConfig.getEapMethod() == WifiEnterpriseConfig.Eap.NONE ) {
return "no enterprise config";
}
}
// TODO: Add more checks
return null;
}
/**
* Identify if this configuration represents a passpoint network
*/
@@ -1327,8 +1273,8 @@ public class WifiConfiguration implements Parcelable {
/** @hide */
public int getAuthType() {
if (isValid() == false) {
throw new IllegalStateException("Invalid configuration");
if (allowedKeyManagement.cardinality() > 1) {
throw new IllegalStateException("More than one auth type set");
}
if (allowedKeyManagement.get(KeyMgmt.WPA_PSK)) {
return KeyMgmt.WPA_PSK;