diff options
6 files changed, 68 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java index 1f343104ae43..c2b307d6a6fc 100644 --- a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java +++ b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java @@ -30,6 +30,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.Objects; /** * Class representing Passpoint configuration. This contains configurations specified in @@ -322,6 +323,14 @@ public final class PasspointConfiguration implements Parcelable { && mUsageLimitTimeLimitInMinutes == that.mUsageLimitTimeLimitInMinutes; } + @Override + public int hashCode() { + return Objects.hash(mHomeSp, mCredential, mPolicy, mSubscriptionUpdate, mTrustRootCertList, + mUpdateIdentifier, mCredentialPriority, mSubscriptionCreationTimeInMs, + mSubscriptionExpirationTimeInMs, mUsageLimitUsageTimePeriodInMinutes, + mUsageLimitStartTimeInMs, mUsageLimitDataLimit, mUsageLimitTimeLimitInMinutes); + } + /** * Validate the configuration data. * diff --git a/wifi/java/android/net/wifi/hotspot2/omadm/XMLNode.java b/wifi/java/android/net/wifi/hotspot2/omadm/XMLNode.java index e87698cb7ed1..959d5057e257 100644 --- a/wifi/java/android/net/wifi/hotspot2/omadm/XMLNode.java +++ b/wifi/java/android/net/wifi/hotspot2/omadm/XMLNode.java @@ -20,6 +20,7 @@ import android.text.TextUtils; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * A class represent a node in an XML tree. Each node is an XML element. @@ -100,4 +101,9 @@ public class XMLNode { TextUtils.equals(mText, that.mText) && mChildren.equals(that.mChildren); } + + @Override + public int hashCode() { + return Objects.hash(mTag, mText, mChildren); + } } diff --git a/wifi/java/android/net/wifi/hotspot2/pps/Credential.java b/wifi/java/android/net/wifi/hotspot2/pps/Credential.java index f780aef1671b..ff93486dd25b 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/Credential.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/Credential.java @@ -31,6 +31,7 @@ import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; import java.util.Arrays; import java.util.HashSet; +import java.util.Objects; import java.util.Set; /** @@ -267,6 +268,12 @@ public final class Credential implements Parcelable { && TextUtils.equals(mNonEapInnerMethod, that.mNonEapInnerMethod); } + @Override + public int hashCode() { + return Objects.hash(mUsername, mPassword, mMachineManaged, mSoftTokenApp, + mAbleToShare, mEapType, mNonEapInnerMethod); + } + /** * Validate the configuration data. * @@ -418,6 +425,11 @@ public final class Credential implements Parcelable { && Arrays.equals(mCertSha256Fingerprint, that.mCertSha256Fingerprint); } + @Override + public int hashCode() { + return Objects.hash(mCertType, mCertSha256Fingerprint); + } + /** * Validate the configuration data. * @@ -534,6 +546,11 @@ public final class Credential implements Parcelable { } @Override + public int hashCode() { + return Objects.hash(mImsi, mEapType); + } + + @Override public void writeToParcel(Parcel dest, int flags) { dest.writeString(mImsi); dest.writeInt(mEapType); @@ -731,6 +748,13 @@ public final class Credential implements Parcelable { && isPrivateKeyEquals(mClientPrivateKey, that.mClientPrivateKey); } + @Override + public int hashCode() { + return Objects.hash(mRealm, mCreationTimeInMs, mExpirationTimeInMs, + mCheckAAAServerCertStatus, mUserCredential, mCertCredential, mSimCredential, + mCaCertificate, mClientCertificateChain, mClientPrivateKey); + } + /** * Validate the configuration data. * diff --git a/wifi/java/android/net/wifi/hotspot2/pps/HomeSP.java b/wifi/java/android/net/wifi/hotspot2/pps/HomeSP.java index c0d6ed8fc156..8b3b79c861af 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/HomeSP.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/HomeSP.java @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.Objects; /** * Class representing HomeSP subtree in PerProviderSubscription (PPS) @@ -236,6 +237,12 @@ public final class HomeSP implements Parcelable { && Arrays.equals(mRoamingConsortiumOIs, that.mRoamingConsortiumOIs); } + @Override + public int hashCode() { + return Objects.hash(mFqdn, mFriendlyName, mIconUrl, mHomeNetworkIds, mMatchAllOIs, + mMatchAnyOIs, mOtherHomePartners, mRoamingConsortiumOIs); + } + /** * Validate HomeSP data. * diff --git a/wifi/java/android/net/wifi/hotspot2/pps/Policy.java b/wifi/java/android/net/wifi/hotspot2/pps/Policy.java index dc7cddfcae3c..ceaada4173de 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/Policy.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/Policy.java @@ -28,6 +28,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; /** * Class representing Policy subtree in PerProviderSubscription (PPS) @@ -249,6 +250,11 @@ public final class Policy implements Parcelable { && TextUtils.equals(mCountries, that.mCountries); } + @Override + public int hashCode() { + return Objects.hash(mFqdn, mFqdnExactMatch, mPriority, mCountries); + } + /** * Validate RoamingParnter data. * @@ -381,6 +387,14 @@ public final class Policy implements Parcelable { : mPolicyUpdate.equals(that.mPolicyUpdate)); } + @Override + public int hashCode() { + return Objects.hash(mMinHomeDownlinkBandwidth, mMinHomeUplinkBandwidth, + mMinRoamingDownlinkBandwidth, mMinRoamingUplinkBandwidth, mExcludedSsidList, + mRequiredProtoPortMap, mMaximumBssLoadValue, mPreferredRoamingPartnerList, + mPolicyUpdate); + } + /** * Validate Policy data. * diff --git a/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java b/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java index 5d028c34c491..17fbf9f0888c 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java @@ -24,6 +24,7 @@ import android.util.Log; import java.nio.charset.StandardCharsets; import java.util.Arrays; +import java.util.Objects; /** * Class representing configuration parameters for subscription or policy update in @@ -241,6 +242,13 @@ public final class UpdateParameter implements Parcelable { that.mTrustRootCertSha256Fingerprint); } + @Override + public int hashCode() { + return Objects.hash(mUpdateIntervalInMinutes, mUpdateMethod, mRestriction, mServerUri, + mUsername, mBase64EncodedPassword, mTrustRootCertUrl, + mTrustRootCertSha256Fingerprint); + } + /** * Validate UpdateParameter data. * |