Merge "Clean up T&C implementation"

    private final boolean mCaptive;

    private final String mVenueFriendlyName;

    private final int mVenueInfoUrlSource;

    private final int mTermsAndConditionsSource;

    private final int mUserPortalUrlSource;

    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    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;

        mCaptive = captive;

        mVenueFriendlyName = venueFriendlyName;

        mVenueInfoUrlSource = venueInfoUrlSource;

        mTermsAndConditionsSource = termsAndConditionsSource;

        mUserPortalUrlSource = userPortalUrlSource;

    }

    private CaptivePortalData(Parcel p) {

        dest.writeBoolean(mCaptive);

        dest.writeString(mVenueFriendlyName);

        dest.writeInt(mVenueInfoUrlSource);

        dest.writeInt(mTermsAndConditionsSource);

        dest.writeInt(mUserPortalUrlSource);

    }

    /**

        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)

     * @return The source that the user portal URL was obtained from

     */

    public @CaptivePortalDataSource int getUserPortalUrlSource() {

        return mTermsAndConditionsSource;

        return mUserPortalUrlSource;

    }

    /**

    public int hashCode() {

        return Objects.hash(mRefreshTimeMillis, mUserPortalUrl, mVenueInfoUrl,

                mIsSessionExtendable, mByteLimit, mExpiryTimeMillis, mCaptive, mVenueFriendlyName,

                mVenueInfoUrlSource, mTermsAndConditionsSource);

                mVenueInfoUrlSource, mUserPortalUrlSource);

    }

    @Override

                && mCaptive == other.mCaptive

                && Objects.equals(mVenueFriendlyName, other.mVenueFriendlyName)

                && mVenueInfoUrlSource == other.mVenueInfoUrlSource

                && mTermsAndConditionsSource == other.mTermsAndConditionsSource;

                && mUserPortalUrlSource == other.mUserPortalUrlSource;

    }

    @Override

                + ", captive: " + mCaptive

                + ", venueFriendlyName: " + mVenueFriendlyName

                + ", venueInfoUrlSource: " + mVenueInfoUrlSource

                + ", termsAndConditionsSource: " + mTermsAndConditionsSource

                + ", userPortalUrlSource: " + mUserPortalUrlSource

                + "}";

    }

}