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

Merge changes from topic 'Passpoint API Rename'

Browse Source 
* changes:
  hotspot2: expose Passpoint APIs as public
  hotspot2: fix class/function/variable names to comply with API guideline
  hotspot2: rename classes to comply with API guideline
This commit is contained in:
Treehugger Robot
2017-02-07 23:25:02 +00:00
committed by Gerrit Code Review
parent 10e7aed13f bffe405e1f
commit 93d66c83cf
17 changed files with 879 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

238
api/current.txt
View File

@@ -24764,6 +24764,7 @@ package android.net.wifi {
public class WifiManager {
method public int addNetwork(android.net.wifi.WifiConfiguration);
method public boolean addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);
method public static int calculateSignalLevel(int, int);
method public void cancelWps(android.net.wifi.WifiManager.WpsCallback);
method public static int compareSignalLevel(int, int);
@@ -24776,6 +24777,7 @@ package android.net.wifi {
method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();
method public android.net.wifi.WifiInfo getConnectionInfo();
method public android.net.DhcpInfo getDhcpInfo();
method public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
method public java.util.List<android.net.wifi.ScanResult> getScanResults();
method public int getWifiState();
method public boolean is5GHzBandSupported();
@@ -24791,6 +24793,7 @@ package android.net.wifi {
method public boolean reassociate();
method public boolean reconnect();
method public boolean removeNetwork(int);
method public boolean removePasspointConfiguration(java.lang.String);
method public boolean saveConfiguration();
method public void setTdlsEnabled(java.net.InetAddress, boolean);
method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);
@@ -25005,6 +25008,241 @@ package android.net.wifi.aware {
}
package android.net.wifi.hotspot2 {
public final class ConfigParser {
method public static android.net.wifi.hotspot2.PasspointConfiguration parsePasspointConfig(java.lang.String, byte[]);
}
public final class PasspointConfiguration implements android.os.Parcelable {
ctor public PasspointConfiguration();
ctor public PasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);
method public int describeContents();
method public android.net.wifi.hotspot2.pps.Credential getCredential();
method public int getCredentialPriority();
method public android.net.wifi.hotspot2.pps.HomeSp getHomeSp();
method public android.net.wifi.hotspot2.pps.Policy getPolicy();
method public long getSubscriptionCreationTimeInMs();
method public long getSubscriptionExpirationTimeInMs();
method public java.lang.String getSubscriptionType();
method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate();
method public java.util.Map<java.lang.String, byte[]> getTrustRootCertList();
method public int getUpdateIdentififer();
method public long getUsageLimitDataLimit();
method public long getUsageLimitStartTimeInMs();
method public long getUsageLimitTimeLimitInMinutes();
method public long getUsageLimitUsageTimePeriodInMinutes();
method public void setCredential(android.net.wifi.hotspot2.pps.Credential);
method public void setCredentialPriority(int);
method public void setHomeSp(android.net.wifi.hotspot2.pps.HomeSp);
method public void setPolicy(android.net.wifi.hotspot2.pps.Policy);
method public void setSubscriptionCreationTimeInMs(long);
method public void setSubscriptionExpirationTimeInMs(long);
method public void setSubscriptionType(java.lang.String);
method public void setSubscriptionUpdate(android.net.wifi.hotspot2.pps.UpdateParameter);
method public void setTrustRootCertList(java.util.Map<java.lang.String, byte[]>);
method public void setUpdateIdentifier(int);
method public void setUsageLimitDataLimit(long);
method public void setUsageLimitStartTimeInMs(long);
method public void setUsageLimitTimeLimitInMinutes(long);
method public void setUsageLimitUsageTimePeriodInMinutes(long);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.PasspointConfiguration> CREATOR;
}
}
package android.net.wifi.hotspot2.omadm {
public final class PpsMoParser {
method public static android.net.wifi.hotspot2.PasspointConfiguration parseMoText(java.lang.String);
}
}
package android.net.wifi.hotspot2.pps {
public final class Credential implements android.os.Parcelable {
ctor public Credential();
ctor public Credential(android.net.wifi.hotspot2.pps.Credential);
method public int describeContents();
method public java.security.cert.X509Certificate getCaCertificate();
method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential();
method public boolean getCheckAaaServerStatus();
method public java.security.cert.X509Certificate[] getClientCertificateChain();
method public java.security.PrivateKey getClientPrivateKey();
method public long getCreationTimeInMs();
method public long getExpirationTimeInMs();
method public java.lang.String getRealm();
method public android.net.wifi.hotspot2.pps.Credential.SimCredential getSimCredential();
method public android.net.wifi.hotspot2.pps.Credential.UserCredential getUserCredential();
method public void setCaCertificate(java.security.cert.X509Certificate);
method public void setCertCredential(android.net.wifi.hotspot2.pps.Credential.CertificateCredential);
method public void setCheckAaaServerCertStatus(boolean);
method public void setClientCertificateChain(java.security.cert.X509Certificate[]);
method public void setClientPrivateKey(java.security.PrivateKey);
method public void setCreationTimeInMs(long);
method public void setExpirationTimeInMs(long);
method public void setRealm(java.lang.String);
method public void setSimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential);
method public void setUserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential> CREATOR;
}
public static final class Credential.CertificateCredential implements android.os.Parcelable {
ctor public Credential.CertificateCredential();
ctor public Credential.CertificateCredential(android.net.wifi.hotspot2.pps.Credential.CertificateCredential);
method public int describeContents();
method public byte[] getCertSha256Fingerprint();
method public java.lang.String getCertType();
method public void setCertSha256Fingerprint(byte[]);
method public void setCertType(java.lang.String);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.CertificateCredential> CREATOR;
}
public static final class Credential.SimCredential implements android.os.Parcelable {
ctor public Credential.SimCredential();
ctor public Credential.SimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential);
method public int describeContents();
method public int getEapType();
method public java.lang.String getImsi();
method public void setEapType(int);
method public void setImsi(java.lang.String);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.SimCredential> CREATOR;
}
public static final class Credential.UserCredential implements android.os.Parcelable {
ctor public Credential.UserCredential();
ctor public Credential.UserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential);
method public int describeContents();
method public boolean getAbleToShare();
method public int getEapType();
method public boolean getMachineManaged();
method public java.lang.String getNonEapInnerMethod();
method public java.lang.String getPassword();
method public java.lang.String getSoftTokenApp();
method public java.lang.String getUsername();
method public void setAbleToShare(boolean);
method public void setEapType(int);
method public void setMachineManaged(boolean);
method public void setNonEapInnerMethod(java.lang.String);
method public void setPassword(java.lang.String);
method public void setSoftTokenApp(java.lang.String);
method public void setUsername(java.lang.String);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.UserCredential> CREATOR;
}
public final class HomeSp implements android.os.Parcelable {
ctor public HomeSp();
ctor public HomeSp(android.net.wifi.hotspot2.pps.HomeSp);
method public int describeContents();
method public java.lang.String getFqdn();
method public java.lang.String getFriendlyName();
method public java.util.Map<java.lang.String, java.lang.Long> getHomeNetworkIds();
method public java.lang.String getIconUrl();
method public long[] getMatchAllOis();
method public long[] getMatchAnysOis();
method public java.lang.String[] getOtherHomePartners();
method public long[] getRoamingConsortiumOis();
method public void setFqdn(java.lang.String);
method public void setFriendlyName(java.lang.String);
method public void setHomeNetworkIds(java.util.Map<java.lang.String, java.lang.Long>);
method public void setIconUrl(java.lang.String);
method public void setMatchAllOis(long[]);
method public void setMatchAnyOis(long[]);
method public void setOtherHomePartners(java.lang.String[]);
method public void setRoamingConsortiumOis(long[]);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.HomeSp> CREATOR;
}
public final class Policy implements android.os.Parcelable {
ctor public Policy();
ctor public Policy(android.net.wifi.hotspot2.pps.Policy);
method public int describeContents();
method public java.lang.String[] getExcludedSsidList();
method public int getMaximumBssLoadValue();
method public long getMinHomeDownlinkBandWidht();
method public long getMinHomeUplinkBandwidth();
method public long getMinRoamingDownlinkBandwidth();
method public long getMinRoamingUplinkBandwidth();
method public android.net.wifi.hotspot2.pps.UpdateParameter getPolicyUpdate();
method public java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> getPreferredRoamingPartnerList();
method public java.util.Map<java.lang.Integer, java.lang.String> getRequiredProtoPortMap();
method public void setExcludedSsidList(java.lang.String[]);
method public void setMaximumBssLoadValue(int);
method public void setMinHomeDownlinkBandwidth(long);
method public void setMinHomeUplinkBandwidth(long);
method public void setMinRoamingDownlinkBandwidth(long);
method public void setMinRoamingUplinkBandwidth(long);
method public void setPolicyUpdate(android.net.wifi.hotspot2.pps.UpdateParameter);
method public void setPreferredRoamingPartnerList(java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner>);
method public void setRequiredProtoPortMap(java.util.Map<java.lang.Integer, java.lang.String>);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy> CREATOR;
}
public static final class Policy.RoamingPartner implements android.os.Parcelable {
ctor public Policy.RoamingPartner();
ctor public Policy.RoamingPartner(android.net.wifi.hotspot2.pps.Policy.RoamingPartner);
method public int describeContents();
method public java.lang.String getCountries();
method public java.lang.String getFqdn();
method public boolean getFqdnExactMatch();
method public int getPriority();
method public void setCountries(java.lang.String);
method public void setFqdn(java.lang.String);
method public void setFqdnExactMatch(boolean);
method public void setPriority(int);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> CREATOR;
}
public final class UpdateParameter implements android.os.Parcelable {
ctor public UpdateParameter();
ctor public UpdateParameter(android.net.wifi.hotspot2.pps.UpdateParameter);
method public int describeContents();
method public java.lang.String getBase64EncodedPassword();
method public java.lang.String getRestriction();
method public java.lang.String getServerUri();
method public byte[] getTrustRootCertSha256Fingerprint();
method public java.lang.String getTrustRootCertUrl();
method public long getUpdateIntervalInMinutes();
method public java.lang.String getUpdateMethod();
method public java.lang.String getUsername();
method public void setBase64EncodedPassword(java.lang.String);
method public void setRestriction(java.lang.String);
method public void setServerUri(java.lang.String);
method public void setTrustRootCertSha256Fingerprint(byte[]);
method public void setTrustRootCertUrl(java.lang.String);
method public void setUpdateIntervalInMinutes(long);
method public void setUpdateMethod(java.lang.String);
method public void setUsername(java.lang.String);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.UpdateParameter> CREATOR;
field public static final long UPDATE_CHECK_INTERVAL_NEVER = 4294967295L; // 0xffffffffL
field public static final java.lang.String UPDATE_METHOD_OMADM = "OMA-DM-ClientInitiated";
field public static final java.lang.String UPDATE_METHOD_SSP = "SSP-ClientInitiated";
field public static final java.lang.String UPDATE_RESTRICTION_HOMESP = "HomeSP";
field public static final java.lang.String UPDATE_RESTRICTION_ROAMING_PARTNER = "RoamingPartner";
field public static final java.lang.String UPDATE_RESTRICTION_UNRESTRICTED = "Unrestricted";
}
}
package android.net.wifi.p2p {
public class WifiP2pConfig implements android.os.Parcelable {

238
api/system-current.txt
View File

@@ -27137,6 +27137,7 @@ package android.net.wifi {
public class WifiManager {
method public int addNetwork(android.net.wifi.WifiConfiguration);
method public boolean addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);
method public static int calculateSignalLevel(int, int);
method public void cancelWps(android.net.wifi.WifiManager.WpsCallback);
method public static int compareSignalLevel(int, int);
@@ -27152,6 +27153,7 @@ package android.net.wifi {
method public android.net.wifi.WifiInfo getConnectionInfo();
method public android.net.wifi.WifiConnectionStatistics getConnectionStatistics();
method public android.net.DhcpInfo getDhcpInfo();
method public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
method public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();
method public java.util.List<android.net.wifi.ScanResult> getScanResults();
method public android.net.wifi.WifiConfiguration getWifiApConfiguration();
@@ -27175,6 +27177,7 @@ package android.net.wifi {
method public boolean reassociate();
method public boolean reconnect();
method public boolean removeNetwork(int);
method public boolean removePasspointConfiguration(java.lang.String);
method public boolean saveConfiguration();
method public void setTdlsEnabled(java.net.InetAddress, boolean);
method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);
@@ -27558,6 +27561,241 @@ package android.net.wifi.aware {
}
package android.net.wifi.hotspot2 {
public final class ConfigParser {
method public static android.net.wifi.hotspot2.PasspointConfiguration parsePasspointConfig(java.lang.String, byte[]);
}
public final class PasspointConfiguration implements android.os.Parcelable {
ctor public PasspointConfiguration();
ctor public PasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);
method public int describeContents();
method public android.net.wifi.hotspot2.pps.Credential getCredential();
method public int getCredentialPriority();
method public android.net.wifi.hotspot2.pps.HomeSp getHomeSp();
method public android.net.wifi.hotspot2.pps.Policy getPolicy();
method public long getSubscriptionCreationTimeInMs();
method public long getSubscriptionExpirationTimeInMs();
method public java.lang.String getSubscriptionType();
method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate();
method public java.util.Map<java.lang.String, byte[]> getTrustRootCertList();
method public int getUpdateIdentififer();
method public long getUsageLimitDataLimit();
method public long getUsageLimitStartTimeInMs();
method public long getUsageLimitTimeLimitInMinutes();
method public long getUsageLimitUsageTimePeriodInMinutes();
method public void setCredential(android.net.wifi.hotspot2.pps.Credential);
method public void setCredentialPriority(int);
method public void setHomeSp(android.net.wifi.hotspot2.pps.HomeSp);
method public void setPolicy(android.net.wifi.hotspot2.pps.Policy);
method public void setSubscriptionCreationTimeInMs(long);
method public void setSubscriptionExpirationTimeInMs(long);
method public void setSubscriptionType(java.lang.String);
method public void setSubscriptionUpdate(android.net.wifi.hotspot2.pps.UpdateParameter);
method public void setTrustRootCertList(java.util.Map<java.lang.String, byte[]>);
method public void setUpdateIdentifier(int);
method public void setUsageLimitDataLimit(long);
method public void setUsageLimitStartTimeInMs(long);
method public void setUsageLimitTimeLimitInMinutes(long);
method public void setUsageLimitUsageTimePeriodInMinutes(long);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.PasspointConfiguration> CREATOR;
}
}
package android.net.wifi.hotspot2.omadm {
public final class PpsMoParser {
method public static android.net.wifi.hotspot2.PasspointConfiguration parseMoText(java.lang.String);
}
}
package android.net.wifi.hotspot2.pps {
public final class Credential implements android.os.Parcelable {
ctor public Credential();
ctor public Credential(android.net.wifi.hotspot2.pps.Credential);
method public int describeContents();
method public java.security.cert.X509Certificate getCaCertificate();
method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential();
method public boolean getCheckAaaServerStatus();
method public java.security.cert.X509Certificate[] getClientCertificateChain();
method public java.security.PrivateKey getClientPrivateKey();
method public long getCreationTimeInMs();
method public long getExpirationTimeInMs();
method public java.lang.String getRealm();
method public android.net.wifi.hotspot2.pps.Credential.SimCredential getSimCredential();
method public android.net.wifi.hotspot2.pps.Credential.UserCredential getUserCredential();
method public void setCaCertificate(java.security.cert.X509Certificate);
method public void setCertCredential(android.net.wifi.hotspot2.pps.Credential.CertificateCredential);
method public void setCheckAaaServerCertStatus(boolean);
method public void setClientCertificateChain(java.security.cert.X509Certificate[]);
method public void setClientPrivateKey(java.security.PrivateKey);
method public void setCreationTimeInMs(long);
method public void setExpirationTimeInMs(long);
method public void setRealm(java.lang.String);
method public void setSimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential);
method public void setUserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential> CREATOR;
}
public static final class Credential.CertificateCredential implements android.os.Parcelable {
ctor public Credential.CertificateCredential();
ctor public Credential.CertificateCredential(android.net.wifi.hotspot2.pps.Credential.CertificateCredential);
method public int describeContents();
method public byte[] getCertSha256Fingerprint();
method public java.lang.String getCertType();
method public void setCertSha256Fingerprint(byte[]);
method public void setCertType(java.lang.String);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.CertificateCredential> CREATOR;
}
public static final class Credential.SimCredential implements android.os.Parcelable {
ctor public Credential.SimCredential();
ctor public Credential.SimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential);
method public int describeContents();
method public int getEapType();
method public java.lang.String getImsi();
method public void setEapType(int);
method public void setImsi(java.lang.String);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.SimCredential> CREATOR;
}
public static final class Credential.UserCredential implements android.os.Parcelable {
ctor public Credential.UserCredential();
ctor public Credential.UserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential);
method public int describeContents();
method public boolean getAbleToShare();
method public int getEapType();
method public boolean getMachineManaged();
method public java.lang.String getNonEapInnerMethod();
method public java.lang.String getPassword();
method public java.lang.String getSoftTokenApp();
method public java.lang.String getUsername();
method public void setAbleToShare(boolean);
method public void setEapType(int);
method public void setMachineManaged(boolean);
method public void setNonEapInnerMethod(java.lang.String);
method public void setPassword(java.lang.String);
method public void setSoftTokenApp(java.lang.String);
method public void setUsername(java.lang.String);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.UserCredential> CREATOR;
}
public final class HomeSp implements android.os.Parcelable {
ctor public HomeSp();
ctor public HomeSp(android.net.wifi.hotspot2.pps.HomeSp);
method public int describeContents();
method public java.lang.String getFqdn();
method public java.lang.String getFriendlyName();
method public java.util.Map<java.lang.String, java.lang.Long> getHomeNetworkIds();
method public java.lang.String getIconUrl();
method public long[] getMatchAllOis();
method public long[] getMatchAnysOis();
method public java.lang.String[] getOtherHomePartners();
method public long[] getRoamingConsortiumOis();
method public void setFqdn(java.lang.String);
method public void setFriendlyName(java.lang.String);
method public void setHomeNetworkIds(java.util.Map<java.lang.String, java.lang.Long>);
method public void setIconUrl(java.lang.String);
method public void setMatchAllOis(long[]);
method public void setMatchAnyOis(long[]);
method public void setOtherHomePartners(java.lang.String[]);
method public void setRoamingConsortiumOis(long[]);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.HomeSp> CREATOR;
}
public final class Policy implements android.os.Parcelable {
ctor public Policy();
ctor public Policy(android.net.wifi.hotspot2.pps.Policy);
method public int describeContents();
method public java.lang.String[] getExcludedSsidList();
method public int getMaximumBssLoadValue();
method public long getMinHomeDownlinkBandWidht();
method public long getMinHomeUplinkBandwidth();
method public long getMinRoamingDownlinkBandwidth();
method public long getMinRoamingUplinkBandwidth();
method public android.net.wifi.hotspot2.pps.UpdateParameter getPolicyUpdate();
method public java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> getPreferredRoamingPartnerList();
method public java.util.Map<java.lang.Integer, java.lang.String> getRequiredProtoPortMap();
method public void setExcludedSsidList(java.lang.String[]);
method public void setMaximumBssLoadValue(int);
method public void setMinHomeDownlinkBandwidth(long);
method public void setMinHomeUplinkBandwidth(long);
method public void setMinRoamingDownlinkBandwidth(long);
method public void setMinRoamingUplinkBandwidth(long);
method public void setPolicyUpdate(android.net.wifi.hotspot2.pps.UpdateParameter);
method public void setPreferredRoamingPartnerList(java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner>);
method public void setRequiredProtoPortMap(java.util.Map<java.lang.Integer, java.lang.String>);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy> CREATOR;
}
public static final class Policy.RoamingPartner implements android.os.Parcelable {
ctor public Policy.RoamingPartner();
ctor public Policy.RoamingPartner(android.net.wifi.hotspot2.pps.Policy.RoamingPartner);
method public int describeContents();
method public java.lang.String getCountries();
method public java.lang.String getFqdn();
method public boolean getFqdnExactMatch();
method public int getPriority();
method public void setCountries(java.lang.String);
method public void setFqdn(java.lang.String);
method public void setFqdnExactMatch(boolean);
method public void setPriority(int);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> CREATOR;
}
public final class UpdateParameter implements android.os.Parcelable {
ctor public UpdateParameter();
ctor public UpdateParameter(android.net.wifi.hotspot2.pps.UpdateParameter);
method public int describeContents();
method public java.lang.String getBase64EncodedPassword();
method public java.lang.String getRestriction();
method public java.lang.String getServerUri();
method public byte[] getTrustRootCertSha256Fingerprint();
method public java.lang.String getTrustRootCertUrl();
method public long getUpdateIntervalInMinutes();
method public java.lang.String getUpdateMethod();
method public java.lang.String getUsername();
method public void setBase64EncodedPassword(java.lang.String);
method public void setRestriction(java.lang.String);
method public void setServerUri(java.lang.String);
method public void setTrustRootCertSha256Fingerprint(byte[]);
method public void setTrustRootCertUrl(java.lang.String);
method public void setUpdateIntervalInMinutes(long);
method public void setUpdateMethod(java.lang.String);
method public void setUsername(java.lang.String);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.UpdateParameter> CREATOR;
field public static final long UPDATE_CHECK_INTERVAL_NEVER = 4294967295L; // 0xffffffffL
field public static final java.lang.String UPDATE_METHOD_OMADM = "OMA-DM-ClientInitiated";
field public static final java.lang.String UPDATE_METHOD_SSP = "SSP-ClientInitiated";
field public static final java.lang.String UPDATE_RESTRICTION_HOMESP = "HomeSP";
field public static final java.lang.String UPDATE_RESTRICTION_ROAMING_PARTNER = "RoamingPartner";
field public static final java.lang.String UPDATE_RESTRICTION_UNRESTRICTED = "Unrestricted";
}
}
package android.net.wifi.p2p {
public class WifiP2pConfig implements android.os.Parcelable {

238
api/test-current.txt
View File

@@ -24837,6 +24837,7 @@ package android.net.wifi {
public class WifiManager {
method public int addNetwork(android.net.wifi.WifiConfiguration);
method public boolean addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);
method public static int calculateSignalLevel(int, int);
method public void cancelWps(android.net.wifi.WifiManager.WpsCallback);
method public static int compareSignalLevel(int, int);
@@ -24849,6 +24850,7 @@ package android.net.wifi {
method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();
method public android.net.wifi.WifiInfo getConnectionInfo();
method public android.net.DhcpInfo getDhcpInfo();
method public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
method public java.util.List<android.net.wifi.ScanResult> getScanResults();
method public int getWifiState();
method public boolean is5GHzBandSupported();
@@ -24864,6 +24866,7 @@ package android.net.wifi {
method public boolean reassociate();
method public boolean reconnect();
method public boolean removeNetwork(int);
method public boolean removePasspointConfiguration(java.lang.String);
method public boolean saveConfiguration();
method public void setTdlsEnabled(java.net.InetAddress, boolean);
method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);
@@ -25078,6 +25081,241 @@ package android.net.wifi.aware {
}
package android.net.wifi.hotspot2 {
public final class ConfigParser {
method public static android.net.wifi.hotspot2.PasspointConfiguration parsePasspointConfig(java.lang.String, byte[]);
}
public final class PasspointConfiguration implements android.os.Parcelable {
ctor public PasspointConfiguration();
ctor public PasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);
method public int describeContents();
method public android.net.wifi.hotspot2.pps.Credential getCredential();
method public int getCredentialPriority();
method public android.net.wifi.hotspot2.pps.HomeSp getHomeSp();
method public android.net.wifi.hotspot2.pps.Policy getPolicy();
method public long getSubscriptionCreationTimeInMs();
method public long getSubscriptionExpirationTimeInMs();
method public java.lang.String getSubscriptionType();
method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate();
method public java.util.Map<java.lang.String, byte[]> getTrustRootCertList();
method public int getUpdateIdentififer();
method public long getUsageLimitDataLimit();
method public long getUsageLimitStartTimeInMs();
method public long getUsageLimitTimeLimitInMinutes();
method public long getUsageLimitUsageTimePeriodInMinutes();
method public void setCredential(android.net.wifi.hotspot2.pps.Credential);
method public void setCredentialPriority(int);
method public void setHomeSp(android.net.wifi.hotspot2.pps.HomeSp);
method public void setPolicy(android.net.wifi.hotspot2.pps.Policy);
method public void setSubscriptionCreationTimeInMs(long);
method public void setSubscriptionExpirationTimeInMs(long);
method public void setSubscriptionType(java.lang.String);
method public void setSubscriptionUpdate(android.net.wifi.hotspot2.pps.UpdateParameter);
method public void setTrustRootCertList(java.util.Map<java.lang.String, byte[]>);
method public void setUpdateIdentifier(int);
method public void setUsageLimitDataLimit(long);
method public void setUsageLimitStartTimeInMs(long);
method public void setUsageLimitTimeLimitInMinutes(long);
method public void setUsageLimitUsageTimePeriodInMinutes(long);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.PasspointConfiguration> CREATOR;
}
}
package android.net.wifi.hotspot2.omadm {
public final class PpsMoParser {
method public static android.net.wifi.hotspot2.PasspointConfiguration parseMoText(java.lang.String);
}
}
package android.net.wifi.hotspot2.pps {
public final class Credential implements android.os.Parcelable {
ctor public Credential();
ctor public Credential(android.net.wifi.hotspot2.pps.Credential);
method public int describeContents();
method public java.security.cert.X509Certificate getCaCertificate();
method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential();
method public boolean getCheckAaaServerStatus();
method public java.security.cert.X509Certificate[] getClientCertificateChain();
method public java.security.PrivateKey getClientPrivateKey();
method public long getCreationTimeInMs();
method public long getExpirationTimeInMs();
method public java.lang.String getRealm();
method public android.net.wifi.hotspot2.pps.Credential.SimCredential getSimCredential();
method public android.net.wifi.hotspot2.pps.Credential.UserCredential getUserCredential();
method public void setCaCertificate(java.security.cert.X509Certificate);
method public void setCertCredential(android.net.wifi.hotspot2.pps.Credential.CertificateCredential);
method public void setCheckAaaServerCertStatus(boolean);
method public void setClientCertificateChain(java.security.cert.X509Certificate[]);
method public void setClientPrivateKey(java.security.PrivateKey);
method public void setCreationTimeInMs(long);
method public void setExpirationTimeInMs(long);
method public void setRealm(java.lang.String);
method public void setSimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential);
method public void setUserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential> CREATOR;
}
public static final class Credential.CertificateCredential implements android.os.Parcelable {
ctor public Credential.CertificateCredential();
ctor public Credential.CertificateCredential(android.net.wifi.hotspot2.pps.Credential.CertificateCredential);
method public int describeContents();
method public byte[] getCertSha256Fingerprint();
method public java.lang.String getCertType();
method public void setCertSha256Fingerprint(byte[]);
method public void setCertType(java.lang.String);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.CertificateCredential> CREATOR;
}
public static final class Credential.SimCredential implements android.os.Parcelable {
ctor public Credential.SimCredential();
ctor public Credential.SimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential);
method public int describeContents();
method public int getEapType();
method public java.lang.String getImsi();
method public void setEapType(int);
method public void setImsi(java.lang.String);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.SimCredential> CREATOR;
}
public static final class Credential.UserCredential implements android.os.Parcelable {
ctor public Credential.UserCredential();
ctor public Credential.UserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential);
method public int describeContents();
method public boolean getAbleToShare();
method public int getEapType();
method public boolean getMachineManaged();
method public java.lang.String getNonEapInnerMethod();
method public java.lang.String getPassword();
method public java.lang.String getSoftTokenApp();
method public java.lang.String getUsername();
method public void setAbleToShare(boolean);
method public void setEapType(int);
method public void setMachineManaged(boolean);
method public void setNonEapInnerMethod(java.lang.String);
method public void setPassword(java.lang.String);
method public void setSoftTokenApp(java.lang.String);
method public void setUsername(java.lang.String);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.UserCredential> CREATOR;
}
public final class HomeSp implements android.os.Parcelable {
ctor public HomeSp();
ctor public HomeSp(android.net.wifi.hotspot2.pps.HomeSp);
method public int describeContents();
method public java.lang.String getFqdn();
method public java.lang.String getFriendlyName();
method public java.util.Map<java.lang.String, java.lang.Long> getHomeNetworkIds();
method public java.lang.String getIconUrl();
method public long[] getMatchAllOis();
method public long[] getMatchAnysOis();
method public java.lang.String[] getOtherHomePartners();
method public long[] getRoamingConsortiumOis();
method public void setFqdn(java.lang.String);
method public void setFriendlyName(java.lang.String);
method public void setHomeNetworkIds(java.util.Map<java.lang.String, java.lang.Long>);
method public void setIconUrl(java.lang.String);
method public void setMatchAllOis(long[]);
method public void setMatchAnyOis(long[]);
method public void setOtherHomePartners(java.lang.String[]);
method public void setRoamingConsortiumOis(long[]);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.HomeSp> CREATOR;
}
public final class Policy implements android.os.Parcelable {
ctor public Policy();
ctor public Policy(android.net.wifi.hotspot2.pps.Policy);
method public int describeContents();
method public java.lang.String[] getExcludedSsidList();
method public int getMaximumBssLoadValue();
method public long getMinHomeDownlinkBandWidht();
method public long getMinHomeUplinkBandwidth();
method public long getMinRoamingDownlinkBandwidth();
method public long getMinRoamingUplinkBandwidth();
method public android.net.wifi.hotspot2.pps.UpdateParameter getPolicyUpdate();
method public java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> getPreferredRoamingPartnerList();
method public java.util.Map<java.lang.Integer, java.lang.String> getRequiredProtoPortMap();
method public void setExcludedSsidList(java.lang.String[]);
method public void setMaximumBssLoadValue(int);
method public void setMinHomeDownlinkBandwidth(long);
method public void setMinHomeUplinkBandwidth(long);
method public void setMinRoamingDownlinkBandwidth(long);
method public void setMinRoamingUplinkBandwidth(long);
method public void setPolicyUpdate(android.net.wifi.hotspot2.pps.UpdateParameter);
method public void setPreferredRoamingPartnerList(java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner>);
method public void setRequiredProtoPortMap(java.util.Map<java.lang.Integer, java.lang.String>);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy> CREATOR;
}
public static final class Policy.RoamingPartner implements android.os.Parcelable {
ctor public Policy.RoamingPartner();
ctor public Policy.RoamingPartner(android.net.wifi.hotspot2.pps.Policy.RoamingPartner);
method public int describeContents();
method public java.lang.String getCountries();
method public java.lang.String getFqdn();
method public boolean getFqdnExactMatch();
method public int getPriority();
method public void setCountries(java.lang.String);
method public void setFqdn(java.lang.String);
method public void setFqdnExactMatch(boolean);
method public void setPriority(int);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> CREATOR;
}
public final class UpdateParameter implements android.os.Parcelable {
ctor public UpdateParameter();
ctor public UpdateParameter(android.net.wifi.hotspot2.pps.UpdateParameter);
method public int describeContents();
method public java.lang.String getBase64EncodedPassword();
method public java.lang.String getRestriction();
method public java.lang.String getServerUri();
method public byte[] getTrustRootCertSha256Fingerprint();
method public java.lang.String getTrustRootCertUrl();
method public long getUpdateIntervalInMinutes();
method public java.lang.String getUpdateMethod();
method public java.lang.String getUsername();
method public void setBase64EncodedPassword(java.lang.String);
method public void setRestriction(java.lang.String);
method public void setServerUri(java.lang.String);
method public void setTrustRootCertSha256Fingerprint(byte[]);
method public void setTrustRootCertUrl(java.lang.String);
method public void setUpdateIntervalInMinutes(long);
method public void setUpdateMethod(java.lang.String);
method public void setUsername(java.lang.String);
method public boolean validate();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.UpdateParameter> CREATOR;
field public static final long UPDATE_CHECK_INTERVAL_NEVER = 4294967295L; // 0xffffffffL
field public static final java.lang.String UPDATE_METHOD_OMADM = "OMA-DM-ClientInitiated";
field public static final java.lang.String UPDATE_METHOD_SSP = "SSP-ClientInitiated";
field public static final java.lang.String UPDATE_RESTRICTION_HOMESP = "HomeSP";
field public static final java.lang.String UPDATE_RESTRICTION_ROAMING_PARTNER = "RoamingPartner";
field public static final java.lang.String UPDATE_RESTRICTION_UNRESTRICTED = "Unrestricted";
}
}
package android.net.wifi.p2p {
public class WifiP2pConfig implements android.os.Parcelable {

3
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -973,7 +973,6 @@ public class WifiManager {
*
* @param config The Passpoint configuration to be added
* @return true on success
* @hide
*/
public boolean addOrUpdatePasspointConfiguration(PasspointConfiguration config) {
try {
@@ -988,7 +987,6 @@ public class WifiManager {
*
* @param fqdn The FQDN of the passpoint configuration to be removed
* @return true on success
* @hide
*/
public boolean removePasspointConfiguration(String fqdn) {
try {
@@ -1004,7 +1002,6 @@ public class WifiManager {
* An empty list will be returned when no configurations are installed.
*
* @return A list of {@link PasspointConfiguration}
* @hide
*/
public List<PasspointConfiguration> getPasspointConfigurations() {
try {

18
wifi/java/android/net/wifi/hotspot2/ConfigBuilder.java → wifi/java/android/net/wifi/hotspot2/ConfigParser.java
View File

@@ -16,7 +16,7 @@
package android.net.wifi.hotspot2;
import android.net.wifi.hotspot2.omadm.PPSMOParser;
import android.net.wifi.hotspot2.omadm.PpsMoParser;
import android.text.TextUtils;
import android.util.Base64;
import android.util.Log;
@@ -41,11 +41,9 @@ import java.util.Map;
/**
* Utility class for building PasspointConfiguration from an installation file.
*
* @hide
*/
public final class ConfigBuilder {
private static final String TAG = "ConfigBuilder";
public final class ConfigParser {
private static final String TAG = "ConfigParser";
// Header names.
private static final String CONTENT_TYPE = "Content-Type";
@@ -101,6 +99,10 @@ public final class ConfigBuilder {
public String encodingType = null;
}
/**
* @hide
*/
public ConfigParser() {}
/**
* Parse the Hotspot 2.0 Release 1 configuration data into a {@link PasspointConfiguration}
@@ -133,7 +135,7 @@ public final class ConfigBuilder {
* certificate chain (optional).
* @return {@link PasspointConfiguration}
*/
public static PasspointConfiguration buildPasspointConfig(String mimeType, byte[] data) {
public static PasspointConfiguration parsePasspointConfig(String mimeType, byte[] data) {
// Verify MIME type.
if (!TextUtils.equals(mimeType, TYPE_WIFI_CONFIG)) {
Log.e(TAG, "Unexpected MIME type: " + mimeType);
@@ -169,7 +171,7 @@ public final class ConfigBuilder {
throw new IOException("Missing Passpoint Profile");
}
PasspointConfiguration config = PPSMOParser.parseMOText(new String(profileData));
PasspointConfiguration config = PpsMoParser.parseMoText(new String(profileData));
if (config == null) {
throw new IOException("Failed to parse Passpoint profile");
}
@@ -470,4 +472,4 @@ public final class ConfigBuilder {
}
return new Pair<PrivateKey, List<X509Certificate>>(clientKey, clientCertificateChain);
}
}
}

14
wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java
View File

@@ -17,7 +17,7 @@
package android.net.wifi.hotspot2;
import android.net.wifi.hotspot2.pps.Credential;
import android.net.wifi.hotspot2.pps.HomeSP;
import android.net.wifi.hotspot2.pps.HomeSp;
import android.net.wifi.hotspot2.pps.Policy;
import android.net.wifi.hotspot2.pps.UpdateParameter;
import android.os.Parcelable;
@@ -38,8 +38,6 @@ import java.util.Objects;
*
* For more info, refer to Hotspot 2.0 PPS MO defined in section 9.1 of the Hotspot 2.0
* Release 2 Technical Specification.
*
* @hide
*/
public final class PasspointConfiguration implements Parcelable {
private static final String TAG = "PasspointConfiguration";
@@ -60,11 +58,11 @@ public final class PasspointConfiguration implements Parcelable {
private static final int NULL_VALUE = -1;
/**
* Configurations under HomeSP subtree.
* Configurations under HomeSp subtree.
*/
private HomeSP mHomeSp = null;
public void setHomeSp(HomeSP homeSp) { mHomeSp = homeSp; }
public HomeSP getHomeSp() { return mHomeSp; }
private HomeSp mHomeSp = null;
public void setHomeSp(HomeSp homeSp) { mHomeSp = homeSp; }
public HomeSp getHomeSp() { return mHomeSp; }
/**
* Configurations under Credential subtree.
@@ -248,7 +246,7 @@ public final class PasspointConfiguration implements Parcelable {
}
if (source.mHomeSp != null) {
mHomeSp = new HomeSP(source.mHomeSp);
mHomeSp = new HomeSp(source.mHomeSp);
}
if (source.mCredential != null) {
mCredential = new Credential(source.mCredential);

27
wifi/java/android/net/wifi/hotspot2/omadm/PPSMOParser.java → wifi/java/android/net/wifi/hotspot2/omadm/PpsMoParser.java
View File

@@ -18,7 +18,7 @@ package android.net.wifi.hotspot2.omadm;
import android.net.wifi.hotspot2.PasspointConfiguration;
import android.net.wifi.hotspot2.pps.Credential;
import android.net.wifi.hotspot2.pps.HomeSP;
import android.net.wifi.hotspot2.pps.HomeSp;
import android.net.wifi.hotspot2.pps.Policy;
import android.net.wifi.hotspot2.pps.UpdateParameter;
import android.text.TextUtils;
@@ -109,11 +109,9 @@ import org.xml.sax.SAXException;
* </Node>
* </Node>
* </MgmtTree>
*
* @hide
*/
public final class PPSMOParser {
private static final String TAG = "PPSMOParser";
public final class PpsMoParser {
private static final String TAG = "PpsMoParser";
/**
* XML tags expected in the PPS MO (PerProviderSubscription Management Object) XML tree.
@@ -325,6 +323,11 @@ public final class PPSMOParser {
}
}
/**
* @hide
*/
public PpsMoParser() {}
/**
* Convert a XML string representation of a PPS MO (PerProviderSubscription
* Management Object) tree to a {@link PasspointConfiguration} object.
@@ -332,7 +335,7 @@ public final class PPSMOParser {
* @param xmlString XML string representation of a PPS MO tree
* @return {@link PasspointConfiguration} or null
*/
public static PasspointConfiguration parseMOText(String xmlString) {
public static PasspointConfiguration parseMoText(String xmlString) {
// Convert the XML string to a XML tree.
XMLParser xmlParser = new XMLParser();
XMLNode root = null;
@@ -640,12 +643,12 @@ public final class PPSMOParser {
* @return HomeSP
* @throws ParsingException
*/
private static HomeSP parseHomeSP(PPSNode node) throws ParsingException {
private static HomeSp parseHomeSP(PPSNode node) throws ParsingException {
if (node.isLeaf()) {
throw new ParsingException("Leaf node not expected for HomeSP");
}
HomeSP homeSp = new HomeSP();
HomeSp homeSp = new HomeSp();
for (PPSNode child : node.getChildren()) {
switch (child.getName()) {
case NODE_FQDN:
@@ -655,7 +658,7 @@ public final class PPSMOParser {
homeSp.setFriendlyName(getPpsNodeValue(child));
break;
case NODE_ROAMING_CONSORTIUM_OI:
homeSp.setRoamingConsortiumOIs(
homeSp.setRoamingConsortiumOis(
parseRoamingConsortiumOI(getPpsNodeValue(child)));
break;
case NODE_ICON_URL:
@@ -666,8 +669,8 @@ public final class PPSMOParser {
break;
case NODE_HOME_OI_LIST:
Pair<List<Long>, List<Long>> homeOIs = parseHomeOIList(child);
homeSp.setMatchAllOIs(convertFromLongList(homeOIs.first));
homeSp.setMatchAnyOIs(convertFromLongList(homeOIs.second));
homeSp.setMatchAllOis(convertFromLongList(homeOIs.first));
homeSp.setMatchAnyOis(convertFromLongList(homeOIs.second));
break;
case NODE_OTHER_HOME_PARTNERS:
homeSp.setOtherHomePartners(parseOtherHomePartners(child));
@@ -909,7 +912,7 @@ public final class PPSMOParser {
credential.setRealm(getPpsNodeValue(child));
break;
case NODE_CHECK_AAA_SERVER_CERT_STATUS:
credential.setCheckAAAServerCertStatus(
credential.setCheckAaaServerCertStatus(
Boolean.parseBoolean(getPpsNodeValue(child)));
break;
case NODE_SIM:

22
wifi/java/android/net/wifi/hotspot2/pps/Credential.java
View File

@@ -42,8 +42,6 @@ import java.util.Set;
*
* In addition to the fields in the Credential subtree, this will also maintain necessary
* information for the private key and certificates associated with this credential.
*
* @hide
*/
public final class Credential implements Parcelable {
private static final String TAG = "Credential";
@@ -98,12 +96,12 @@ public final class Credential implements Parcelable {
* and Accounting) server's certificate during EAP (Extensible Authentication
* Protocol) authentication.
*/
private boolean mCheckAAAServerCertStatus = false;
public void setCheckAAAServerCertStatus(boolean checkAAAServerCertStatus) {
mCheckAAAServerCertStatus = checkAAAServerCertStatus;
private boolean mCheckAaaServerCertStatus = false;
public void setCheckAaaServerCertStatus(boolean checkAaaServerCertStatus) {
mCheckAaaServerCertStatus = checkAaaServerCertStatus;
}
public boolean getCheckAAAServerStatus() {
return mCheckAAAServerCertStatus;
public boolean getCheckAaaServerStatus() {
return mCheckAaaServerCertStatus;
}
/**
@@ -685,7 +683,7 @@ public final class Credential implements Parcelable {
mCreationTimeInMs = source.mCreationTimeInMs;
mExpirationTimeInMs = source.mExpirationTimeInMs;
mRealm = source.mRealm;
mCheckAAAServerCertStatus = source.mCheckAAAServerCertStatus;
mCheckAaaServerCertStatus = source.mCheckAaaServerCertStatus;
if (source.mUserCredential != null) {
mUserCredential = new UserCredential(source.mUserCredential);
}
@@ -714,7 +712,7 @@ public final class Credential implements Parcelable {
dest.writeLong(mCreationTimeInMs);
dest.writeLong(mExpirationTimeInMs);
dest.writeString(mRealm);
dest.writeInt(mCheckAAAServerCertStatus ? 1 : 0);
dest.writeInt(mCheckAaaServerCertStatus ? 1 : 0);
dest.writeParcelable(mUserCredential, flags);
dest.writeParcelable(mCertCredential, flags);
dest.writeParcelable(mSimCredential, flags);
@@ -736,7 +734,7 @@ public final class Credential implements Parcelable {
return TextUtils.equals(mRealm, that.mRealm)
&& mCreationTimeInMs == that.mCreationTimeInMs
&& mExpirationTimeInMs == that.mExpirationTimeInMs
&& mCheckAAAServerCertStatus == that.mCheckAAAServerCertStatus
&& mCheckAaaServerCertStatus == that.mCheckAaaServerCertStatus
&& (mUserCredential == null ? that.mUserCredential == null
: mUserCredential.equals(that.mUserCredential))
&& (mCertCredential == null ? that.mCertCredential == null
@@ -751,7 +749,7 @@ public final class Credential implements Parcelable {
@Override
public int hashCode() {
return Objects.hash(mRealm, mCreationTimeInMs, mExpirationTimeInMs,
mCheckAAAServerCertStatus, mUserCredential, mCertCredential, mSimCredential,
mCheckAaaServerCertStatus, mUserCredential, mCertCredential, mSimCredential,
mCaCertificate, mClientCertificateChain, mClientPrivateKey);
}
@@ -800,7 +798,7 @@ public final class Credential implements Parcelable {
credential.setCreationTimeInMs(in.readLong());
credential.setExpirationTimeInMs(in.readLong());
credential.setRealm(in.readString());
credential.setCheckAAAServerCertStatus(in.readInt() != 0);
credential.setCheckAaaServerCertStatus(in.readInt() != 0);
credential.setUserCredential(in.readParcelable(null));
credential.setCertCredential(in.readParcelable(null));
credential.setSimCredential(in.readParcelable(null));

2
wifi/java/android/net/wifi/hotspot2/pps/HomeSP.aidl → wifi/java/android/net/wifi/hotspot2/pps/HomeSp.aidl
View File

@@ -16,4 +16,4 @@
package android.net.wifi.hotspot2.pps;
parcelable HomeSP;
parcelable HomeSp;

96
wifi/java/android/net/wifi/hotspot2/pps/HomeSP.java → wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java
View File

@@ -34,11 +34,9 @@ import java.util.Objects;
*
* For more info, refer to Hotspot 2.0 PPS MO defined in section 9.1 of the Hotspot 2.0
* Release 2 Technical Specification.
*
* @hide
*/
public final class HomeSP implements Parcelable {
private static final String TAG = "HomeSP";
public final class HomeSp implements Parcelable {
private static final String TAG = "HomeSp";
/**
* Maximum number of bytes allowed for a SSID.
@@ -108,12 +106,12 @@ public final class HomeSP implements Parcelable {
* Refer to HomeSP/HomeOIList subtree in PerProviderSubscription (PPS) Management Object
* (MO) tree for more detail.
*/
private long[] mMatchAllOIs = null;
public void setMatchAllOIs(long[] matchAllOIs) {
mMatchAllOIs = matchAllOIs;
private long[] mMatchAllOis = null;
public void setMatchAllOis(long[] matchAllOis) {
mMatchAllOis = matchAllOis;
}
public long[] getMatchAllOIs() {
return mMatchAllOIs;
public long[] getMatchAllOis() {
return mMatchAllOis;
}
/**
@@ -129,12 +127,12 @@ public final class HomeSP implements Parcelable {
* Refer to HomeSP/HomeOIList subtree in PerProviderSubscription (PPS) Management Object
* (MO) tree for more detail.
*/
private long[] mMatchAnyOIs = null;
public void setMatchAnyOIs(long[] matchAnyOIs) {
mMatchAnyOIs = matchAnyOIs;
private long[] mMatchAnyOis = null;
public void setMatchAnyOis(long[] matchAnyOis) {
mMatchAnyOis = matchAnyOis;
}
public long[] getMatchAnysOIs() {
return mMatchAnyOIs;
public long[] getMatchAnysOis() {
return mMatchAnyOis;
}
/**
@@ -155,25 +153,25 @@ public final class HomeSP implements Parcelable {
* List of Organization Identifiers (OIs) identifying a roaming consortium of
* which this provider is a member.
*/
private long[] mRoamingConsortiumOIs = null;
public void setRoamingConsortiumOIs(long[] roamingConsortiumOIs) {
mRoamingConsortiumOIs = roamingConsortiumOIs;
private long[] mRoamingConsortiumOis = null;
public void setRoamingConsortiumOis(long[] roamingConsortiumOis) {
mRoamingConsortiumOis = roamingConsortiumOis;
}
public long[] getRoamingConsortiumOIs() {
return mRoamingConsortiumOIs;
public long[] getRoamingConsortiumOis() {
return mRoamingConsortiumOis;
}
/**
* Constructor for creating HomeSP with default values.
* Constructor for creating HomeSp with default values.
*/
public HomeSP() {}
public HomeSp() {}
/**
* Copy constructor.
*
* @param source The source to copy from
*/
public HomeSP(HomeSP source) {
public HomeSp(HomeSp source) {
if (source == null) {
return;
}
@@ -183,19 +181,19 @@ public final class HomeSP implements Parcelable {
if (source.mHomeNetworkIds != null) {
mHomeNetworkIds = Collections.unmodifiableMap(source.mHomeNetworkIds);
}
if (source.mMatchAllOIs != null) {
mMatchAllOIs = Arrays.copyOf(source.mMatchAllOIs, source.mMatchAllOIs.length);
if (source.mMatchAllOis != null) {
mMatchAllOis = Arrays.copyOf(source.mMatchAllOis, source.mMatchAllOis.length);
}
if (source.mMatchAnyOIs != null) {
mMatchAnyOIs = Arrays.copyOf(source.mMatchAnyOIs, source.mMatchAnyOIs.length);
if (source.mMatchAnyOis != null) {
mMatchAnyOis = Arrays.copyOf(source.mMatchAnyOis, source.mMatchAnyOis.length);
}
if (source.mOtherHomePartners != null) {
mOtherHomePartners = Arrays.copyOf(source.mOtherHomePartners,
source.mOtherHomePartners.length);
}
if (source.mRoamingConsortiumOIs != null) {
mRoamingConsortiumOIs = Arrays.copyOf(source.mRoamingConsortiumOIs,
source.mRoamingConsortiumOIs.length);
if (source.mRoamingConsortiumOis != null) {
mRoamingConsortiumOis = Arrays.copyOf(source.mRoamingConsortiumOis,
source.mRoamingConsortiumOis.length);
}
}
@@ -210,10 +208,10 @@ public final class HomeSP implements Parcelable {
dest.writeString(mFriendlyName);
dest.writeString(mIconUrl);
writeHomeNetworkIds(dest, mHomeNetworkIds);
dest.writeLongArray(mMatchAllOIs);
dest.writeLongArray(mMatchAnyOIs);
dest.writeLongArray(mMatchAllOis);
dest.writeLongArray(mMatchAnyOis);
dest.writeStringArray(mOtherHomePartners);
dest.writeLongArray(mRoamingConsortiumOIs);
dest.writeLongArray(mRoamingConsortiumOis);
}
@Override
@@ -221,30 +219,30 @@ public final class HomeSP implements Parcelable {
if (this == thatObject) {
return true;
}
if (!(thatObject instanceof HomeSP)) {
if (!(thatObject instanceof HomeSp)) {
return false;
}
HomeSP that = (HomeSP) thatObject;
HomeSp that = (HomeSp) thatObject;
return TextUtils.equals(mFqdn, that.mFqdn)
&& TextUtils.equals(mFriendlyName, that.mFriendlyName)
&& TextUtils.equals(mIconUrl, that.mIconUrl)
&& (mHomeNetworkIds == null ? that.mHomeNetworkIds == null
: mHomeNetworkIds.equals(that.mHomeNetworkIds))
&& Arrays.equals(mMatchAllOIs, that.mMatchAllOIs)
&& Arrays.equals(mMatchAnyOIs, that.mMatchAnyOIs)
&& Arrays.equals(mMatchAllOis, that.mMatchAllOis)
&& Arrays.equals(mMatchAnyOis, that.mMatchAnyOis)
&& Arrays.equals(mOtherHomePartners, that.mOtherHomePartners)
&& Arrays.equals(mRoamingConsortiumOIs, that.mRoamingConsortiumOIs);
&& Arrays.equals(mRoamingConsortiumOis, that.mRoamingConsortiumOis);
}
@Override
public int hashCode() {
return Objects.hash(mFqdn, mFriendlyName, mIconUrl, mHomeNetworkIds, mMatchAllOIs,
mMatchAnyOIs, mOtherHomePartners, mRoamingConsortiumOIs);
return Objects.hash(mFqdn, mFriendlyName, mIconUrl, mHomeNetworkIds, mMatchAllOis,
mMatchAnyOis, mOtherHomePartners, mRoamingConsortiumOis);
}
/**
* Validate HomeSP data.
* Validate HomeSp data.
*
* @return true on success or false on failure
*/
@@ -270,25 +268,25 @@ public final class HomeSP implements Parcelable {
return true;
}
public static final Creator<HomeSP> CREATOR =
new Creator<HomeSP>() {
public static final Creator<HomeSp> CREATOR =
new Creator<HomeSp>() {
@Override
public HomeSP createFromParcel(Parcel in) {
HomeSP homeSp = new HomeSP();
public HomeSp createFromParcel(Parcel in) {
HomeSp homeSp = new HomeSp();
homeSp.setFqdn(in.readString());
homeSp.setFriendlyName(in.readString());
homeSp.setIconUrl(in.readString());
homeSp.setHomeNetworkIds(readHomeNetworkIds(in));
homeSp.setMatchAllOIs(in.createLongArray());
homeSp.setMatchAnyOIs(in.createLongArray());
homeSp.setMatchAllOis(in.createLongArray());
homeSp.setMatchAnyOis(in.createLongArray());
homeSp.setOtherHomePartners(in.createStringArray());
homeSp.setRoamingConsortiumOIs(in.createLongArray());
homeSp.setRoamingConsortiumOis(in.createLongArray());
return homeSp;
}
@Override
public HomeSP[] newArray(int size) {
return new HomeSP[size];
public HomeSp[] newArray(int size) {
return new HomeSp[size];
}
/**

10
wifi/java/android/net/wifi/hotspot2/pps/Policy.java
View File

@@ -40,17 +40,10 @@ import java.util.Objects;
*
* For more info, refer to Hotspot 2.0 PPS MO defined in section 9.1 of the Hotspot 2.0
* Release 2 Technical Specification.
*
* @hide
*/
public final class Policy implements Parcelable {
private static final String TAG = "Policy";
/**
* Default priority for preferred roaming partner.
*/
public static final int PREFERRED_ROAMING_PARTNER_DEFAULT_PRIORITY = 128;
/**
* Maximum number of SSIDs in the exclusion list.
*/
@@ -189,8 +182,9 @@ public final class Policy implements Parcelable {
/**
* Priority associated with this roaming partner policy.
* Using Integer.MIN_VALUE to indicate unset value.
*/
private int mPriority = PREFERRED_ROAMING_PARTNER_DEFAULT_PRIORITY;
private int mPriority = Integer.MIN_VALUE;
public void setPriority(int priority) {
mPriority = priority;
}

2
wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java
View File

@@ -34,8 +34,6 @@ import java.util.Objects;
*
* For more info, refer to Hotspot 2.0 PPS MO defined in section 9.1 of the Hotspot 2.0
* Release 2 Technical Specification.
*
* @hide
*/
public final class UpdateParameter implements Parcelable {
private static final String TAG = "UpdateParameter";

24
wifi/tests/src/android/net/wifi/hotspot2/ConfigBuilderTest.java → wifi/tests/src/android/net/wifi/hotspot2/ConfigParserTest.java
View File

@@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue;
import android.net.wifi.FakeKeys;
import android.net.wifi.hotspot2.pps.Credential;
import android.net.wifi.hotspot2.pps.HomeSP;
import android.net.wifi.hotspot2.pps.HomeSp;
import android.test.suitebuilder.annotation.SmallTest;
import java.io.BufferedReader;
@@ -33,10 +33,10 @@ import java.util.Arrays;
import org.junit.Test;
/**
* Unit tests for {@link android.net.wifi.hotspot2.ConfigBuilder}.
* Unit tests for {@link android.net.wifi.hotspot2.ConfigParser}.
*/
@SmallTest
public class ConfigBuilderTest {
public class ConfigParserTest {
/**
* Hotspot 2.0 Release 1 installation file that contains a Passpoint profile and a
* CA (Certificate Authority) X.509 certificate {@link FakeKeys#CA_CERT0}.
@@ -83,10 +83,10 @@ public class ConfigBuilderTest {
PasspointConfiguration config = new PasspointConfiguration();
// HomeSP configuration.
HomeSP homeSp = new HomeSP();
HomeSp homeSp = new HomeSp();
homeSp.setFriendlyName("Century House");
homeSp.setFqdn("mi6.co.uk");
homeSp.setRoamingConsortiumOIs(new long[] {0x112233L, 0x445566L});
homeSp.setRoamingConsortiumOis(new long[] {0x112233L, 0x445566L});
config.setHomeSp(homeSp);
// Credential configuration.
@@ -123,7 +123,7 @@ public class ConfigBuilderTest {
String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITH_CA_CERT);
PasspointConfiguration expectedConfig = generateConfigurationFromProfile();
PasspointConfiguration actualConfig =
ConfigBuilder.buildPasspointConfig(
ConfigParser.parsePasspointConfig(
"application/x-wifi-config", configStr.getBytes());
assertTrue(actualConfig.equals(expectedConfig));
}
@@ -136,7 +136,7 @@ public class ConfigBuilderTest {
@Test
public void parseConfigFileWithInvalidMimeType() throws Exception {
String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITH_CA_CERT);
assertNull(ConfigBuilder.buildPasspointConfig(
assertNull(ConfigParser.parsePasspointConfig(
"application/wifi-config", configStr.getBytes()));
}
@@ -148,7 +148,7 @@ public class ConfigBuilderTest {
@Test
public void parseConfigFileWithUnencodedData() throws Exception {
String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITH_UNENCODED_DATA);
assertNull(ConfigBuilder.buildPasspointConfig(
assertNull(ConfigParser.parsePasspointConfig(
"application/x-wifi-config", configStr.getBytes()));
}
@@ -160,7 +160,7 @@ public class ConfigBuilderTest {
@Test
public void parseConfigFileWithInvalidPart() throws Exception {
String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITH_INVALID_PART);
assertNull(ConfigBuilder.buildPasspointConfig(
assertNull(ConfigParser.parsePasspointConfig(
"application/x-wifi-config", configStr.getBytes()));
}
@@ -172,7 +172,7 @@ public class ConfigBuilderTest {
@Test
public void parseConfigFileWithMissingBoundary() throws Exception {
String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITH_MISSING_BOUNDARY);
assertNull(ConfigBuilder.buildPasspointConfig(
assertNull(ConfigParser.parsePasspointConfig(
"application/x-wifi-config", configStr.getBytes()));
}
@@ -185,7 +185,7 @@ public class ConfigBuilderTest {
@Test
public void parseConfigFileWithInvalidContentType() throws Exception {
String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITH_INVALID_CONTENT_TYPE);
assertNull(ConfigBuilder.buildPasspointConfig(
assertNull(ConfigParser.parsePasspointConfig(
"application/x-wifi-config", configStr.getBytes()));
}
@@ -197,7 +197,7 @@ public class ConfigBuilderTest {
@Test
public void parseConfigFileWithoutPasspointProfile() throws Exception {
String configStr = loadResourceFile(PASSPOINT_INSTALLATION_FILE_WITHOUT_PROFILE);
assertNull(ConfigBuilder.buildPasspointConfig(
assertNull(ConfigParser.parsePasspointConfig(
"application/x-wifi-config", configStr.getBytes()));
}
}

8
wifi/tests/src/android/net/wifi/hotspot2/PasspointConfigurationTest.java
View File

@@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue;
import android.net.wifi.EAPConstants;
import android.net.wifi.hotspot2.pps.Credential;
import android.net.wifi.hotspot2.pps.HomeSP;
import android.net.wifi.hotspot2.pps.HomeSp;
import android.net.wifi.hotspot2.pps.Policy;
import android.net.wifi.hotspot2.pps.UpdateParameter;
import android.os.Parcel;
@@ -50,11 +50,11 @@ public class PasspointConfigurationTest {
*
* @return {@link android.net.wifi.hotspot2.pps.HomeSP}
*/
private static HomeSP createHomeSp() {
HomeSP homeSp = new HomeSP();
private static HomeSp createHomeSp() {
HomeSp homeSp = new HomeSp();
homeSp.setFqdn("fqdn");
homeSp.setFriendlyName("friendly name");
homeSp.setRoamingConsortiumOIs(new long[] {0x55, 0x66});
homeSp.setRoamingConsortiumOis(new long[] {0x55, 0x66});
return homeSp;
}

36
wifi/tests/src/android/net/wifi/hotspot2/omadm/PPSMOParserTest.java → wifi/tests/src/android/net/wifi/hotspot2/omadm/PpsMoParserTest.java
View File

@@ -19,10 +19,10 @@ package android.net.wifi.hotspot2.omadm;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import android.net.wifi.hotspot2.omadm.PPSMOParser;
import android.net.wifi.hotspot2.omadm.PpsMoParser;
import android.net.wifi.hotspot2.PasspointConfiguration;
import android.net.wifi.hotspot2.pps.Credential;
import android.net.wifi.hotspot2.pps.HomeSP;
import android.net.wifi.hotspot2.pps.HomeSp;
import android.net.wifi.hotspot2.pps.Policy;
import android.net.wifi.hotspot2.pps.UpdateParameter;
import android.test.suitebuilder.annotation.SmallTest;
@@ -43,10 +43,10 @@ import java.util.List;
import java.util.Map;
/**
* Unit tests for {@link android.net.wifi.hotspot2.omadm.PPSMOParser}.
* Unit tests for {@link android.net.wifi.hotspot2.omadm.PpsMoParser}.
*/
@SmallTest
public class PPSMOParserTest {
public class PpsMoParserTest {
private static final String VALID_PPS_MO_XML_FILE = "assets/pps/PerProviderSubscription.xml";
private static final String PPS_MO_XML_FILE_DUPLICATE_HOMESP =
"assets/pps/PerProviderSubscription_DuplicateHomeSP.xml";
@@ -122,17 +122,17 @@ public class PPSMOParserTest {
config.setUsageLimitUsageTimePeriodInMinutes(99910);
// HomeSP configuration.
HomeSP homeSp = new HomeSP();
HomeSp homeSp = new HomeSp();
homeSp.setFriendlyName("Century House");
homeSp.setFqdn("mi6.co.uk");
homeSp.setRoamingConsortiumOIs(new long[] {0x112233L, 0x445566L});
homeSp.setRoamingConsortiumOis(new long[] {0x112233L, 0x445566L});
homeSp.setIconUrl("icon.test.com");
Map<String, Long> homeNetworkIds = new HashMap<>();
homeNetworkIds.put("TestSSID", 0x12345678L);
homeNetworkIds.put("NullHESSID", null);
homeSp.setHomeNetworkIds(homeNetworkIds);
homeSp.setMatchAllOIs(new long[] {0x11223344});
homeSp.setMatchAnyOIs(new long[] {0x55667788});
homeSp.setMatchAllOis(new long[] {0x11223344});
homeSp.setMatchAnyOis(new long[] {0x55667788});
homeSp.setOtherHomePartners(new String[] {"other.fqdn.com"});
config.setHomeSp(homeSp);
@@ -141,7 +141,7 @@ public class PPSMOParserTest {
credential.setCreationTimeInMs(format.parse("2016-01-01T10:00:00Z").getTime());
credential.setExpirationTimeInMs(format.parse("2016-02-01T10:00:00Z").getTime());
credential.setRealm("shaken.stirred.com");
credential.setCheckAAAServerCertStatus(true);
credential.setCheckAaaServerCertStatus(true);
Credential.UserCredential userCredential = new Credential.UserCredential();
userCredential.setUsername("james");
userCredential.setPassword("Ym9uZDAwNw==");
@@ -209,53 +209,53 @@ public class PPSMOParserTest {
public void parseValidPPSMOTree() throws Exception {
String ppsMoTree = loadResourceFile(VALID_PPS_MO_XML_FILE);
PasspointConfiguration expectedConfig = generateConfigurationFromPPSMOTree();
PasspointConfiguration actualConfig = PPSMOParser.parseMOText(ppsMoTree);
PasspointConfiguration actualConfig = PpsMoParser.parseMoText(ppsMoTree);
assertTrue(actualConfig.equals(expectedConfig));
}
@Test
public void parseNullPPSMOTree() throws Exception {
assertEquals(null, PPSMOParser.parseMOText(null));
assertEquals(null, PpsMoParser.parseMoText(null));
}
@Test
public void parseEmptyPPSMOTree() throws Exception {
assertEquals(null, PPSMOParser.parseMOText(new String()));
assertEquals(null, PpsMoParser.parseMoText(new String()));
}
@Test
public void parsePPSMOTreeWithDuplicateHomeSP() throws Exception {
assertEquals(null, PPSMOParser.parseMOText(
assertEquals(null, PpsMoParser.parseMoText(
loadResourceFile(PPS_MO_XML_FILE_DUPLICATE_HOMESP)));
}
@Test
public void parsePPSMOTreeWithDuplicateValue() throws Exception {
assertEquals(null, PPSMOParser.parseMOText(
assertEquals(null, PpsMoParser.parseMoText(
loadResourceFile(PPS_MO_XML_FILE_DUPLICATE_VALUE)));
}
@Test
public void parsePPSMOTreeWithMissingValue() throws Exception {
assertEquals(null, PPSMOParser.parseMOText(
assertEquals(null, PpsMoParser.parseMoText(
loadResourceFile(PPS_MO_XML_FILE_MISSING_VALUE)));
}
@Test
public void parsePPSMOTreeWithMissingName() throws Exception {
assertEquals(null, PPSMOParser.parseMOText(
assertEquals(null, PpsMoParser.parseMoText(
loadResourceFile(PPS_MO_XML_FILE_MISSING_NAME)));
}
@Test
public void parsePPSMOTreeWithInvalidNode() throws Exception {
assertEquals(null, PPSMOParser.parseMOText(
assertEquals(null, PpsMoParser.parseMoText(
loadResourceFile(PPS_MO_XML_FILE_INVALID_NODE)));
}
@Test
public void parsePPSMOTreeWithInvalidName() throws Exception {
assertEquals(null, PPSMOParser.parseMOText(
assertEquals(null, PpsMoParser.parseMoText(
loadResourceFile(PPS_MO_XML_FILE_INVALID_NAME)));
}
}

2
wifi/tests/src/android/net/wifi/hotspot2/pps/CredentialTest.java
View File

@@ -59,7 +59,7 @@ public class CredentialTest {
cred.setCreationTimeInMs(123455L);
cred.setExpirationTimeInMs(2310093L);
cred.setRealm("realm");
cred.setCheckAAAServerCertStatus(true);
cred.setCheckAaaServerCertStatus(true);
cred.setUserCredential(userCred);
cred.setCertCredential(certCred);
cred.setSimCredential(simCred);

78
wifi/tests/src/android/net/wifi/hotspot2/pps/HomeSPTest.java → wifi/tests/src/android/net/wifi/hotspot2/pps/HomeSpTest.java
View File

@@ -30,10 +30,10 @@ import java.util.HashMap;
import java.util.Map;
/**
* Unit tests for {@link android.net.wifi.hotspot2.pps.HomeSP}.
* Unit tests for {@link android.net.wifi.hotspot2.pps.HomeSp}.
*/
@SmallTest
public class HomeSPTest {
public class HomeSpTest {
/**
* Helper function for creating a map of home network IDs for testing.
@@ -48,68 +48,68 @@ public class HomeSPTest {
}
/**
* Helper function for creating a HomeSP for testing.
* Helper function for creating a HomeSp for testing.
*
* @param homeNetworkIds The map of home network IDs associated with HomeSP
* @return {@link HomeSP}
* @param homeNetworkIds The map of home network IDs associated with HomeSp
* @return {@link HomeSp}
*/
private static HomeSP createHomeSp(Map<String, Long> homeNetworkIds) {
HomeSP homeSp = new HomeSP();
private static HomeSp createHomeSp(Map<String, Long> homeNetworkIds) {
HomeSp homeSp = new HomeSp();
homeSp.setFqdn("fqdn");
homeSp.setFriendlyName("friendly name");
homeSp.setIconUrl("icon.url");
homeSp.setHomeNetworkIds(homeNetworkIds);
homeSp.setMatchAllOIs(new long[] {0x11L, 0x22L});
homeSp.setMatchAnyOIs(new long[] {0x33L, 0x44L});
homeSp.setMatchAllOis(new long[] {0x11L, 0x22L});
homeSp.setMatchAnyOis(new long[] {0x33L, 0x44L});
homeSp.setOtherHomePartners(new String[] {"partner1", "partner2"});
homeSp.setRoamingConsortiumOIs(new long[] {0x55, 0x66});
homeSp.setRoamingConsortiumOis(new long[] {0x55, 0x66});
return homeSp;
}
/**
* Helper function for creating a HomeSP with home network IDs for testing.
* Helper function for creating a HomeSp with home network IDs for testing.
*
* @return {@link HomeSP}
* @return {@link HomeSp}
*/
private static HomeSP createHomeSpWithHomeNetworkIds() {
private static HomeSp createHomeSpWithHomeNetworkIds() {
return createHomeSp(createHomeNetworkIds());
}
/**
* Helper function for creating a HomeSP without home network IDs for testing.
* Helper function for creating a HomeSp without home network IDs for testing.
*
* @return {@link HomeSP}
* @return {@link HomeSp}
*/
private static HomeSP createHomeSpWithoutHomeNetworkIds() {
private static HomeSp createHomeSpWithoutHomeNetworkIds() {
return createHomeSp(null);
}
/**
* Helper function for verifying HomeSP after parcel write then read.
* Helper function for verifying HomeSp after parcel write then read.
* @param writeHomeSp
* @throws Exception
*/
private static void verifyParcel(HomeSP writeHomeSp) throws Exception {
private static void verifyParcel(HomeSp writeHomeSp) throws Exception {
Parcel parcel = Parcel.obtain();
writeHomeSp.writeToParcel(parcel, 0);
parcel.setDataPosition(0); // Rewind data position back to the beginning for read.
HomeSP readHomeSp = HomeSP.CREATOR.createFromParcel(parcel);
HomeSp readHomeSp = HomeSp.CREATOR.createFromParcel(parcel);
assertTrue(readHomeSp.equals(writeHomeSp));
}
/**
* Verify parcel read/write for an empty HomeSP.
* Verify parcel read/write for an empty HomeSp.
*
* @throws Exception
*/
@Test
public void verifyParcelWithEmptyHomeSP() throws Exception {
verifyParcel(new HomeSP());
public void verifyParcelWithEmptyHomeSp() throws Exception {
verifyParcel(new HomeSp());
}
/**
* Verify parcel read/write for a HomeSP containing Home Network IDs.
* Verify parcel read/write for a HomeSp containing Home Network IDs.
*
* @throws Exception
*/
@@ -119,7 +119,7 @@ public class HomeSPTest {
}
/**
* Verify parcel read/write for a HomeSP without Home Network IDs.
* Verify parcel read/write for a HomeSp without Home Network IDs.
*
* @throws Exception
*/
@@ -129,62 +129,62 @@ public class HomeSPTest {
}
/**
* Verify that a HomeSP is valid when both FQDN and Friendly Name
* Verify that a HomeSp is valid when both FQDN and Friendly Name
* are provided.
*
* @throws Exception
*/
@Test
public void validateValidHomeSP() throws Exception {
HomeSP homeSp = createHomeSpWithHomeNetworkIds();
public void validateValidHomeSp() throws Exception {
HomeSp homeSp = createHomeSpWithHomeNetworkIds();
assertTrue(homeSp.validate());
}
/**
* Verify that a HomeSP is not valid when FQDN is not provided
* Verify that a HomeSp is not valid when FQDN is not provided
*
* @throws Exception
*/
@Test
public void validateHomeSpWithoutFqdn() throws Exception {
HomeSP homeSp = createHomeSpWithHomeNetworkIds();
HomeSp homeSp = createHomeSpWithHomeNetworkIds();
homeSp.setFqdn(null);
assertFalse(homeSp.validate());
}
/**
* Verify that a HomeSP is not valid when Friendly Name is not provided
* Verify that a HomeSp is not valid when Friendly Name is not provided
*
* @throws Exception
*/
@Test
public void validateHomeSpWithoutFriendlyName() throws Exception {
HomeSP homeSp = createHomeSpWithHomeNetworkIds();
HomeSp homeSp = createHomeSpWithHomeNetworkIds();
homeSp.setFriendlyName(null);
assertFalse(homeSp.validate());
}
/**
* Verify that a HomeSP is valid when the optional Home Network IDs are
* Verify that a HomeSp is valid when the optional Home Network IDs are
* not provided.
*
* @throws Exception
*/
@Test
public void validateHomeSpWithoutHomeNetworkIds() throws Exception {
HomeSP homeSp = createHomeSpWithoutHomeNetworkIds();
HomeSp homeSp = createHomeSpWithoutHomeNetworkIds();
assertTrue(homeSp.validate());
}
/**
* Verify that a HomeSP is invalid when the optional Home Network IDs
* Verify that a HomeSp is invalid when the optional Home Network IDs
* contained an invalid SSID (exceeding maximum number of bytes).
*
* @throws Exception
*/
@Test
public void validateHomeSpWithInvalidHomeNetworkIds() throws Exception {
HomeSP homeSp = createHomeSpWithoutHomeNetworkIds();
HomeSp homeSp = createHomeSpWithoutHomeNetworkIds();
// HomeNetworkID with SSID exceeding the maximum length.
Map<String, Long> homeNetworkIds = new HashMap<>();
byte[] rawSsidBytes = new byte[33];
@@ -202,8 +202,8 @@ public class HomeSPTest {
*/
@Test
public void validateCopyConstructorFromNullSource() throws Exception {
HomeSP copySp = new HomeSP(null);
HomeSP defaultSp = new HomeSP();
HomeSp copySp = new HomeSp(null);
HomeSp defaultSp = new HomeSp();
assertTrue(copySp.equals(defaultSp));
}
@@ -214,8 +214,8 @@ public class HomeSPTest {
*/
@Test
public void validateCopyConstructorFromValidSource() throws Exception {
HomeSP sourceSp = createHomeSpWithHomeNetworkIds();
HomeSP copySp = new HomeSP(sourceSp);
HomeSp sourceSp = createHomeSpWithHomeNetworkIds();
HomeSp copySp = new HomeSp(sourceSp);
assertTrue(copySp.equals(sourceSp));
}
}