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

Commit 9c436078 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clean up T&C implementation" am: e22fe5dd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28c5722b7d9e4089be8f42149c3a0407ea3500a7
parents 4f40f1c1 e22fe5dd
Loading
Loading
Loading
Loading
+9 −9
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public final class CaptivePortalData implements Parcelable {
    private final boolean mCaptive;
    private final String mVenueFriendlyName;
    private final int mVenueInfoUrlSource;
    private final int mTermsAndConditionsSource;
    private final int mUserPortalUrlSource;

    /** @hide */
    @Retention(RetentionPolicy.SOURCE)
@@ -65,7 +65,7 @@ public final class CaptivePortalData implements Parcelable {

    private CaptivePortalData(long refreshTimeMillis, Uri userPortalUrl, Uri venueInfoUrl,
            boolean isSessionExtendable, long byteLimit, long expiryTimeMillis, boolean captive,
            String venueFriendlyName, int venueInfoUrlSource, int termsAndConditionsSource) {
            String venueFriendlyName, int venueInfoUrlSource, int userPortalUrlSource) {
        mRefreshTimeMillis = refreshTimeMillis;
        mUserPortalUrl = userPortalUrl;
        mVenueInfoUrl = venueInfoUrl;
@@ -75,7 +75,7 @@ public final class CaptivePortalData implements Parcelable {
        mCaptive = captive;
        mVenueFriendlyName = venueFriendlyName;
        mVenueInfoUrlSource = venueInfoUrlSource;
        mTermsAndConditionsSource = termsAndConditionsSource;
        mUserPortalUrlSource = userPortalUrlSource;
    }

    private CaptivePortalData(Parcel p) {
@@ -100,7 +100,7 @@ public final class CaptivePortalData implements Parcelable {
        dest.writeBoolean(mCaptive);
        dest.writeString(mVenueFriendlyName);
        dest.writeInt(mVenueInfoUrlSource);
        dest.writeInt(mTermsAndConditionsSource);
        dest.writeInt(mUserPortalUrlSource);
    }

    /**
@@ -130,7 +130,7 @@ public final class CaptivePortalData implements Parcelable {
        public Builder(@Nullable CaptivePortalData data) {
            if (data == null) return;
            setRefreshTime(data.mRefreshTimeMillis)
                    .setUserPortalUrl(data.mUserPortalUrl, data.mTermsAndConditionsSource)
                    .setUserPortalUrl(data.mUserPortalUrl, data.mUserPortalUrlSource)
                    .setVenueInfoUrl(data.mVenueInfoUrl, data.mVenueInfoUrlSource)
                    .setSessionExtendable(data.mIsSessionExtendable)
                    .setBytesRemaining(data.mByteLimit)
@@ -314,7 +314,7 @@ public final class CaptivePortalData implements Parcelable {
     * @return The source that the user portal URL was obtained from
     */
    public @CaptivePortalDataSource int getUserPortalUrlSource() {
        return mTermsAndConditionsSource;
        return mUserPortalUrlSource;
    }

    /**
@@ -342,7 +342,7 @@ public final class CaptivePortalData implements Parcelable {
    public int hashCode() {
        return Objects.hash(mRefreshTimeMillis, mUserPortalUrl, mVenueInfoUrl,
                mIsSessionExtendable, mByteLimit, mExpiryTimeMillis, mCaptive, mVenueFriendlyName,
                mVenueInfoUrlSource, mTermsAndConditionsSource);
                mVenueInfoUrlSource, mUserPortalUrlSource);
    }

    @Override
@@ -358,7 +358,7 @@ public final class CaptivePortalData implements Parcelable {
                && mCaptive == other.mCaptive
                && Objects.equals(mVenueFriendlyName, other.mVenueFriendlyName)
                && mVenueInfoUrlSource == other.mVenueInfoUrlSource
                && mTermsAndConditionsSource == other.mTermsAndConditionsSource;
                && mUserPortalUrlSource == other.mUserPortalUrlSource;
    }

    @Override
@@ -373,7 +373,7 @@ public final class CaptivePortalData implements Parcelable {
                + ", captive: " + mCaptive
                + ", venueFriendlyName: " + mVenueFriendlyName
                + ", venueInfoUrlSource: " + mVenueInfoUrlSource
                + ", termsAndConditionsSource: " + mTermsAndConditionsSource
                + ", userPortalUrlSource: " + mUserPortalUrlSource
                + "}";
    }
}