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

Commit b5ca6f36 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
Merged-In: I15ccae472f30d7ae968816479f6ea35d90248fe0
parent 06b63dcb

api/current.txt

+0 −9
Original line number Diff line number Diff line
@@ -25302,7 +25302,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;

  }
@@ -25343,7 +25342,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;

  }
@@ -25356,7 +25354,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;

  }
@@ -25369,7 +25366,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;

  }
@@ -25392,7 +25388,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;

  }
@@ -25417,7 +25412,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;

  }
@@ -25444,7 +25438,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;

  }
@@ -25461,7 +25454,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;

  }
@@ -25486,7 +25478,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
@@ -27862,7 +27862,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;

  }
@@ -27903,7 +27902,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;

  }
@@ -27916,7 +27914,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;

  }
@@ -27929,7 +27926,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;

  }
@@ -27952,7 +27948,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;

  }
@@ -27977,7 +27972,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;

  }
@@ -28004,7 +27998,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;

  }
@@ -28021,7 +28014,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;

  }
@@ -28046,7 +28038,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
@@ -25375,7 +25375,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;

  }
@@ -25416,7 +25415,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;

  }
@@ -25429,7 +25427,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;

  }
@@ -25442,7 +25439,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;

  }
@@ -25465,7 +25461,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;

  }
@@ -25490,7 +25485,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;

  }
@@ -25517,7 +25511,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;

  }
@@ -25534,7 +25527,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;

  }
@@ -25559,7 +25551,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)) {