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

Commit 10da2c2d authored by Peter Qiu's avatar Peter Qiu Committed by android-build-merger
Browse files

Merge "hotspot2: hide Release 2 APIs" into oc-dev 

am: 39da850a

Change-Id: Id5e1f6184de563b51fcd185fb2768c648f788ff9
parents a0c2c896 39da850a

api/current.txt

+0 −118
Original line number Diff line number Diff line
@@ -26754,33 +26754,9 @@ package android.net.wifi.hotspot2 { 
    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 getSubscriptionCreationTimeInMillis();

    method public long getSubscriptionExpirationTimeInMillis();

    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 getUpdateIdentifier();

    method public long getUsageLimitDataLimit();

    method public long getUsageLimitStartTimeInMillis();

    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 setSubscriptionCreationTimeInMillis(long);

    method public void setSubscriptionExpirationTimeInMillis(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 setUsageLimitStartTimeInMillis(long);

    method public void setUsageLimitTimeLimitInMinutes(long);

    method public void setUsageLimitUsageTimePeriodInMinutes(long);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.PasspointConfiguration> CREATOR;

  }
@@ -26803,21 +26779,15 @@ package android.net.wifi.hotspot2.pps { 
    method public int describeContents();

    method public java.security.cert.X509Certificate getCaCertificate();

    method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential();

    method public boolean getCheckAaaServerCertStatus();

    method public java.security.cert.X509Certificate[] getClientCertificateChain();

    method public java.security.PrivateKey getClientPrivateKey();

    method public long getCreationTimeInMillis();

    method public long getExpirationTimeInMillis();

    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 setCreationTimeInMillis(long);

    method public void setExpirationTimeInMillis(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);
@@ -26853,19 +26823,13 @@ package android.net.wifi.hotspot2.pps { 
    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 void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.UserCredential> CREATOR;
@@ -26877,96 +26841,14 @@ package android.net.wifi.hotspot2.pps { 
    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[] getMatchAnyOis();

    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 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 getMinHomeDownlinkBandwidth();













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

























api/system-current.txt



+0
−118






























Original line number
Diff line number
Diff line








@@ -29450,33 +29450,9 @@ package android.net.wifi.hotspot2 {













    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 getSubscriptionCreationTimeInMillis();













    method public long getSubscriptionExpirationTimeInMillis();













    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 getUpdateIdentifier();













    method public long getUsageLimitDataLimit();













    method public long getUsageLimitStartTimeInMillis();













    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 setSubscriptionCreationTimeInMillis(long);













    method public void setSubscriptionExpirationTimeInMillis(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 setUsageLimitStartTimeInMillis(long);













    method public void setUsageLimitTimeLimitInMinutes(long);













    method public void setUsageLimitUsageTimePeriodInMinutes(long);















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.PasspointConfiguration> CREATOR;















  }









@@ -29499,21 +29475,15 @@ package android.net.wifi.hotspot2.pps {













    method public int describeContents();















    method public java.security.cert.X509Certificate getCaCertificate();















    method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential();













    method public boolean getCheckAaaServerCertStatus();















    method public java.security.cert.X509Certificate[] getClientCertificateChain();















    method public java.security.PrivateKey getClientPrivateKey();













    method public long getCreationTimeInMillis();













    method public long getExpirationTimeInMillis();















    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 setCreationTimeInMillis(long);













    method public void setExpirationTimeInMillis(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);










@@ -29549,19 +29519,13 @@ package android.net.wifi.hotspot2.pps {













    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 void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.UserCredential> CREATOR;









@@ -29573,96 +29537,14 @@ package android.net.wifi.hotspot2.pps {













    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[] getMatchAnyOis();













    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 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 getMinHomeDownlinkBandwidth();













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

























api/test-current.txt



+0
−118




























File changed.
Preview size limit exceeded, changes collapsed.
























wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java



+72
−0




























File changed.
Preview size limit exceeded, changes collapsed.
























wifi/java/android/net/wifi/hotspot2/pps/Credential.java



+36
−0






























Original line number
Diff line number
Diff line








@@ -59,9 +59,15 @@ public final class Credential implements Parcelable {













     * Using Long.MIN_VALUE to indicate unset value.















     */















    private long mCreationTimeInMillis = Long.MIN_VALUE;













    /**













     * @hide













     */















    public void setCreationTimeInMillis(long creationTimeInMillis) {















        mCreationTimeInMillis = creationTimeInMillis;















    }













    /**













     * @hide













     */















    public long getCreationTimeInMillis() {















        return mCreationTimeInMillis;















    }









@@ -72,9 +78,15 @@ public final class Credential implements Parcelable {













    * Using Long.MIN_VALUE to indicate unset value.















     */















    private long mExpirationTimeInMillis = Long.MIN_VALUE;













    /**













     * @hide













     */















    public void setExpirationTimeInMillis(long expirationTimeInMillis) {















        mExpirationTimeInMillis = expirationTimeInMillis;















    }













    /**













     * @hide













     */















    public long getExpirationTimeInMillis() {















        return mExpirationTimeInMillis;















    }









@@ -98,9 +110,15 @@ public final class Credential implements Parcelable {













     * Protocol) authentication.















     */















    private boolean mCheckAaaServerCertStatus = false;













    /**













     * @hide













     */















    public void setCheckAaaServerCertStatus(boolean checkAaaServerCertStatus) {















        mCheckAaaServerCertStatus = checkAaaServerCertStatus;















    }













    /**













     * @hide













     */















    public boolean getCheckAaaServerCertStatus() {















        return mCheckAaaServerCertStatus;















    }










@@ -166,9 +184,15 @@ public final class Credential implements Parcelable {













         * Flag indicating if the password is machine managed.















         */















        private boolean mMachineManaged = false;













        /**













         * @hide













         */















        public void setMachineManaged(boolean machineManaged) {















            mMachineManaged = machineManaged;















        }













        /**













         * @hide













         */















        public boolean getMachineManaged() {















            return mMachineManaged;















        }









@@ -177,9 +201,15 @@ public final class Credential implements Parcelable {













         * The name of the application used to generate the password.















         */















        private String mSoftTokenApp = null;













        /**













         * @hide













         */















        public void setSoftTokenApp(String softTokenApp) {















            mSoftTokenApp = softTokenApp;















        }













        /**













         * @hide













         */















        public String getSoftTokenApp() {















            return mSoftTokenApp;















        }









@@ -188,9 +218,15 @@ public final class Credential implements Parcelable {













         * Flag indicating if this credential is usable on other mobile devices as well.















         */















        private boolean mAbleToShare = false;













        /**













         * @hide













         */















        public void setAbleToShare(boolean ableToShare) {















            mAbleToShare = ableToShare;















        }













        /**













         * @hide













         */















        public boolean getAbleToShare() {















            return mAbleToShare;















        }