diff options
5 files changed, 157 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java index 7de55aa5ffb2..333a4f7dc3ce 100644 --- a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java +++ b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java @@ -28,6 +28,7 @@ import android.os.Parcel; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -329,6 +330,50 @@ public final class PasspointConfiguration implements Parcelable { mUsageLimitStartTimeInMs, mUsageLimitDataLimit, mUsageLimitTimeLimitInMinutes); } + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("UpdateIdentifier: ").append(mUpdateIdentifier).append("\n"); + builder.append("CredentialPriority: ").append(mCredentialPriority).append("\n"); + builder.append("SubscriptionCreationTime: ").append( + mSubscriptionCreationTimeInMs != Long.MIN_VALUE + ? new Date(mSubscriptionCreationTimeInMs) : "Not specified").append("\n"); + builder.append("SubscriptionExpirationTime: ").append( + mSubscriptionExpirationTimeInMs != Long.MIN_VALUE + ? new Date(mSubscriptionExpirationTimeInMs) : "Not specified").append("\n"); + builder.append("UsageLimitStartTime: ").append(mUsageLimitStartTimeInMs != Long.MIN_VALUE + ? new Date(mUsageLimitStartTimeInMs) : "Not specified").append("\n"); + builder.append("UsageTimePeriod: ").append(mUsageLimitUsageTimePeriodInMinutes) + .append("\n"); + builder.append("UsageLimitDataLimit: ").append(mUsageLimitDataLimit).append("\n"); + builder.append("UsageLimitTimeLimit: ").append(mUsageLimitTimeLimitInMinutes).append("\n"); + if (mHomeSp != null) { + builder.append("HomeSP Begin ---\n"); + builder.append(mHomeSp); + builder.append("HomeSP End ---\n"); + } + if (mCredential != null) { + builder.append("Credential Begin ---\n"); + builder.append(mCredential); + builder.append("Credential End ---\n"); + } + if (mPolicy != null) { + builder.append("Policy Begin ---\n"); + builder.append(mPolicy); + builder.append("Policy End ---\n"); + } + if (mSubscriptionUpdate != null) { + builder.append("SubscriptionUpdate Begin ---\n"); + builder.append(mSubscriptionUpdate); + builder.append("SubscriptionUpdate End ---\n"); + } + if (mTrustRootCertList != null) { + builder.append("TrustRootCertServers: ").append(mTrustRootCertList.keySet()) + .append("\n"); + } + return builder.toString(); + } + /** * Validate the configuration data. * diff --git a/wifi/java/android/net/wifi/hotspot2/pps/Credential.java b/wifi/java/android/net/wifi/hotspot2/pps/Credential.java index d8da84f28df6..67fa1bbccd1e 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/Credential.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/Credential.java @@ -30,6 +30,7 @@ import java.security.PrivateKey; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; import java.util.Arrays; +import java.util.Date; import java.util.HashSet; import java.util.Objects; import java.util.Set; @@ -282,6 +283,18 @@ public final class Credential implements Parcelable { mAbleToShare, mEapType, mNonEapInnerMethod); } + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("Username: ").append(mUsername).append("\n"); + builder.append("MachineManaged: ").append(mMachineManaged).append("\n"); + builder.append("SoftTokenApp: ").append(mSoftTokenApp).append("\n"); + builder.append("AbleToShare: ").append(mAbleToShare).append("\n"); + builder.append("EAPType: ").append(mEapType).append("\n"); + builder.append("AuthMethod: ").append(mNonEapInnerMethod).append("\n"); + return builder.toString(); + } + /** * Validate the configuration data. * @@ -440,6 +453,11 @@ public final class Credential implements Parcelable { return Objects.hash(mCertType, mCertSha256Fingerprint); } + @Override + public String toString() { + return "CertificateType: " + mCertType + "\n"; + } + /** * Validate the configuration data. * @@ -562,6 +580,14 @@ public final class Credential implements Parcelable { } @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("IMSI: ").append(mImsi).append("\n"); + builder.append("EAPType: ").append(mEapType).append("\n"); + return builder.toString(); + } + + @Override public void writeToParcel(Parcel dest, int flags) { dest.writeString(mImsi); dest.writeInt(mEapType); @@ -767,6 +793,33 @@ public final class Credential implements Parcelable { mCaCertificate, mClientCertificateChain, mClientPrivateKey); } + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("Realm: ").append(mRealm).append("\n"); + builder.append("CreationTime: ").append(mCreationTimeInMs != Long.MIN_VALUE + ? new Date(mCreationTimeInMs) : "Not specified").append("\n"); + builder.append("ExpirationTime: ").append(mExpirationTimeInMs != Long.MIN_VALUE + ? new Date(mExpirationTimeInMs) : "Not specified").append("\n"); + builder.append("CheckAAAServerStatus: ").append(mCheckAaaServerCertStatus).append("\n"); + if (mUserCredential != null) { + builder.append("UserCredential Begin ---\n"); + builder.append(mUserCredential); + builder.append("UserCredential End ---\n"); + } + if (mCertCredential != null) { + builder.append("CertificateCredential Begin ---\n"); + builder.append(mCertCredential); + builder.append("CertificateCredential End ---\n"); + } + if (mSimCredential != null) { + builder.append("SIMCredential Begin ---\n"); + builder.append(mSimCredential); + builder.append("SIMCredential End ---\n"); + } + return builder.toString(); + } + /** * 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 68bdf37b1815..9192ab015e20 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java @@ -241,6 +241,20 @@ public final class HomeSp implements Parcelable { mMatchAnyOis, mOtherHomePartners, mRoamingConsortiumOis); } + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("FQDN: ").append(mFqdn).append("\n"); + builder.append("FriendlyName: ").append(mFriendlyName).append("\n"); + builder.append("IconURL: ").append(mIconUrl).append("\n"); + builder.append("HomeNetworkIDs: ").append(mHomeNetworkIds).append("\n"); + builder.append("MatchAllOIs: ").append(mMatchAllOis).append("\n"); + builder.append("MatchAnyOIs: ").append(mMatchAnyOis).append("\n"); + builder.append("OtherHomePartners: ").append(mOtherHomePartners).append("\n"); + builder.append("RoamingConsortiumOIs: ").append(mRoamingConsortiumOis).append("\n"); + return builder.toString(); + } + /** * 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 da36a116fbbe..1df70f8d45d0 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/Policy.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/Policy.java @@ -249,6 +249,16 @@ public final class Policy implements Parcelable { return Objects.hash(mFqdn, mFqdnExactMatch, mPriority, mCountries); } + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("FQDN: ").append(mFqdn).append("\n"); + builder.append("ExactMatch: ").append("mFqdnExactMatch").append("\n"); + builder.append("Priority: ").append(mPriority).append("\n"); + builder.append("Countries: ").append(mCountries).append("\n"); + return builder.toString(); + } + /** * Validate RoamingParnter data. * @@ -390,6 +400,29 @@ public final class Policy implements Parcelable { mPolicyUpdate); } + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("MinHomeDownlinkBandwidth: ").append(mMinHomeDownlinkBandwidth) + .append("\n"); + builder.append("MinHomeUplinkBandwidth: ").append(mMinHomeUplinkBandwidth).append("\n"); + builder.append("MinRoamingDownlinkBandwidth: ").append(mMinRoamingDownlinkBandwidth) + .append("\n"); + builder.append("MinRoamingUplinkBandwidth: ").append(mMinRoamingUplinkBandwidth) + .append("\n"); + builder.append("ExcludedSSIDList: ").append(mExcludedSsidList).append("\n"); + builder.append("RequiredProtoPortMap: ").append(mRequiredProtoPortMap).append("\n"); + builder.append("MaximumBSSLoadValue: ").append(mMaximumBssLoadValue).append("\n"); + builder.append("PreferredRoamingPartnerList: ").append(mPreferredRoamingPartnerList) + .append("\n"); + if (mPolicyUpdate != null) { + builder.append("PolicyUpdate Begin ---\n"); + builder.append(mPolicyUpdate); + builder.append("PolicyUpdate End ---\n"); + } + return builder.toString(); + } + /** * 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 ae051b0a6e3f..a7adfeb9ec0f 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java @@ -247,6 +247,18 @@ public final class UpdateParameter implements Parcelable { mTrustRootCertSha256Fingerprint); } + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("UpdateInterval: ").append(mUpdateIntervalInMinutes).append("\n"); + builder.append("UpdateMethod: ").append(mUpdateMethod).append("\n"); + builder.append("Restriction: ").append(mRestriction).append("\n"); + builder.append("ServerURI: ").append(mServerUri).append("\n"); + builder.append("Username: ").append(mUsername).append("\n"); + builder.append("TrustRootCertURL: ").append(mTrustRootCertUrl).append("\n"); + return builder.toString(); + } + /** * Validate UpdateParameter data. * |