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

Commit fbc605ca authored by Peter Qiu's avatar Peter Qiu
Browse files

hotspot2: hide validate method for Passpoint configuration 

The validate method is used by Framework only, no need to expose
to app developers. So hide it.

Bug: 35756298
Test: make -j32
Change-Id: I15ccae472f30d7ae968816479f6ea35d90248fe0
parent 457411af

api/current.txt

+0 −9
Original line number Diff line number Diff line
@@ -26618,7 +26618,6 @@ package android.net.wifi.hotspot2 { 
    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;

  }
@@ -26659,7 +26658,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26672,7 +26670,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26685,7 +26682,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26708,7 +26704,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26733,7 +26728,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26760,7 +26754,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26777,7 +26770,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26802,7 +26794,6 @@ package android.net.wifi.hotspot2.pps { 
    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

api/system-current.txt

+0 −9
Original line number Diff line number Diff line
@@ -29313,7 +29313,6 @@ package android.net.wifi.hotspot2 { 
    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;

  }
@@ -29354,7 +29353,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -29367,7 +29365,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -29380,7 +29377,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -29403,7 +29399,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -29428,7 +29423,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -29455,7 +29449,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -29472,7 +29465,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -29497,7 +29489,6 @@ package android.net.wifi.hotspot2.pps { 
    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

api/test-current.txt

+0 −9
Original line number Diff line number Diff line
@@ -26719,7 +26719,6 @@ package android.net.wifi.hotspot2 { 
    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;

  }
@@ -26760,7 +26759,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26773,7 +26771,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26786,7 +26783,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26809,7 +26805,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26834,7 +26829,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26861,7 +26855,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26878,7 +26871,6 @@ package android.net.wifi.hotspot2.pps { 
    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;

  }
@@ -26903,7 +26895,6 @@ package android.net.wifi.hotspot2.pps { 
    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

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

+1 −0
Original line number Diff line number Diff line
@@ -333,6 +333,7 @@ public final class PasspointConfiguration implements Parcelable { 
     * Validate the configuration data.

     *

     * @return true on success or false on failure

     * @hide

     */

    public boolean validate() {

        if (mHomeSp == null || !mHomeSp.validate()) {

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

+4 −0
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ public final class Credential implements Parcelable { 
         * Validate the configuration data.

         *

         * @return true on success or false on failure

         * @hide

         */

        public boolean validate() {

            if (TextUtils.isEmpty(mUsername)) {
@@ -443,6 +444,7 @@ public final class Credential implements Parcelable { 
         * Validate the configuration data.

         *

         * @return true on success or false on failure

         * @hide

         */

        public boolean validate() {

            if (!TextUtils.equals(CERT_TYPE_X509V3, mCertType)) {
@@ -569,6 +571,7 @@ public final class Credential implements Parcelable { 
         * Validate the configuration data.

         *

         * @return true on success or false on failure

         * @hide

         */

        public boolean validate() {

            // Note: this only validate the format of IMSI string itself.  Additional verification
@@ -768,6 +771,7 @@ public final class Credential implements Parcelable { 
     * Validate the configuration data.

     *

     * @return true on success or false on failure

     * @hide

     */

    public boolean validate() {

        if (TextUtils.isEmpty(mRealm)) {