From b5ca6f36b54023f6336740cf3bff79c08ecb6609 Mon Sep 17 00:00:00 2001 From: Peter Qiu Date: Fri, 3 Mar 2017 09:15:49 -0800 Subject: [PATCH] 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 --- api/current.txt | 9 --------- api/system-current.txt | 9 --------- api/test-current.txt | 9 --------- .../net/wifi/hotspot2/PasspointConfiguration.java | 1 + wifi/java/android/net/wifi/hotspot2/pps/Credential.java | 4 ++++ wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java | 1 + wifi/java/android/net/wifi/hotspot2/pps/Policy.java | 2 ++ .../android/net/wifi/hotspot2/pps/UpdateParameter.java | 1 + 8 files changed, 9 insertions(+), 27 deletions(-) diff --git a/api/current.txt b/api/current.txt index cf9e5aeda8736..f64efbf2a4e5f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 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 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 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 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 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 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); method public void setRequiredProtoPortMap(java.util.Map); - method public boolean validate(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator 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 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 CREATOR; field public static final long UPDATE_CHECK_INTERVAL_NEVER = 4294967295L; // 0xffffffffL diff --git a/api/system-current.txt b/api/system-current.txt index 2ae443a1644de..b3eaebd6fc6e5 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 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 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 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 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 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 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); method public void setRequiredProtoPortMap(java.util.Map); - method public boolean validate(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator 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 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 CREATOR; field public static final long UPDATE_CHECK_INTERVAL_NEVER = 4294967295L; // 0xffffffffL diff --git a/api/test-current.txt b/api/test-current.txt index 81976520827ba..7defb4c8775ad 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 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 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 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 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 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 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); method public void setRequiredProtoPortMap(java.util.Map); - method public boolean validate(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator 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 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 CREATOR; field public static final long UPDATE_CHECK_INTERVAL_NEVER = 4294967295L; // 0xffffffffL diff --git a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java index 1f661c4580aff..7de55aa5ffb23 100644 --- a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java +++ b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java @@ -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()) { diff --git a/wifi/java/android/net/wifi/hotspot2/pps/Credential.java b/wifi/java/android/net/wifi/hotspot2/pps/Credential.java index 23888411c1b21..d8da84f28df66 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/Credential.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/Credential.java @@ -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)) { diff --git a/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java b/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java index 8ec40c00304fd..68bdf37b18157 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java @@ -245,6 +245,7 @@ public final class HomeSp implements Parcelable { * Validate HomeSp data. * * @return true on success or false on failure + * @hide */ public boolean validate() { if (TextUtils.isEmpty(mFqdn)) { diff --git a/wifi/java/android/net/wifi/hotspot2/pps/Policy.java b/wifi/java/android/net/wifi/hotspot2/pps/Policy.java index 63238e86c0fdb..da36a116fbbe9 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/Policy.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/Policy.java @@ -253,6 +253,7 @@ public final class Policy implements Parcelable { * Validate RoamingParnter data. * * @return true on success + * @hide */ public boolean validate() { if (TextUtils.isEmpty(mFqdn)) { @@ -393,6 +394,7 @@ public final class Policy implements Parcelable { * Validate Policy data. * * @return true on success + * @hide */ public boolean validate() { if (mPolicyUpdate == null) { diff --git a/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java b/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java index 70264b0e625a4..ae051b0a6e3fa 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java @@ -251,6 +251,7 @@ public final class UpdateParameter implements Parcelable { * Validate UpdateParameter data. * * @return true on success + * @hide */ public boolean validate() { if (mUpdateIntervalInMinutes == Long.MIN_VALUE) {