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

hotspot2: expose Passpoint APIs as public

Browse Source 
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I8bf5c715b9088c673e59a73a78e18f6e6b64d1d1
This commit is contained in:
Peter Qiu
2017-01-31 20:08:38 -08:00
parent da8a67e8a6
commit bffe405e1f
11 changed files with 726 additions and 23 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 {

7
wifi/java/android/net/wifi/hotspot2/ConfigParser.java
View File

@@ -41,8 +41,6 @@ import java.util.Map;
/**
* Utility class for building PasspointConfiguration from an installation file.
*
* @hide
*/
public final class ConfigParser {
private static final String TAG = "ConfigParser";
@@ -101,6 +99,11 @@ public final class ConfigParser {
public String encodingType = null;
}
/**
* @hide
*/
public ConfigParser() {}
/**
* Parse the Hotspot 2.0 Release 1 configuration data into a {@link PasspointConfiguration}
* object. The configuration data is a base64 encoded MIME multipart data. Below is

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

@@ -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";

7
wifi/java/android/net/wifi/hotspot2/omadm/PpsMoParser.java
View File

@@ -109,8 +109,6 @@ import org.xml.sax.SAXException;
* </Node>
* </Node>
* </MgmtTree>
*
* @hide
*/
public final class PpsMoParser {
private static final String TAG = "PpsMoParser";
@@ -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.

2
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";

2
wifi/java/android/net/wifi/hotspot2/pps/HomeSp.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 HomeSp implements Parcelable {
private static final String TAG = "HomeSp";

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";