Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93d66c83 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic 'Passpoint API Rename' 

* 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
parents 10e7aed1 bffe405e

api/current.txt

+238 −0
Original line number Diff line number Diff line
@@ -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 {

























api/system-current.txt



+238
−0


























File changed.
Preview size limit exceeded, changes collapsed.
























api/test-current.txt



+238
−0


























File changed.
Preview size limit exceeded, changes collapsed.
























wifi/java/android/net/wifi/WifiManager.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -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 {

































wifi/java/android/net/wifi/hotspot2/ConfigBuilder.java→wifi/java/android/net/wifi/hotspot2/ConfigParser.java



+10
−8




























Original line number
Diff line number
Diff line








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















        }