LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Clean up T&C implementation" am: 27f44dc792

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28c5722b7d9e4089be8f42149c3a0407ea3500a7
This commit is contained in:
Treehugger Robot
2021-02-23 23:49:21 +00:00
committed by Automerger Merge Worker
parent 9af180ede6 27f44dc792
commit 23cce86e06
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
framework/src/android/net/CaptivePortalData.java
View File

@@ -44,7 +44,7 @@ public final class CaptivePortalData implements Parcelable {
private final boolean mCaptive; private final boolean mCaptive;
private final String mVenueFriendlyName; private final String mVenueFriendlyName;
private final int mVenueInfoUrlSource; private final int mVenueInfoUrlSource;
private final int mTermsAndConditionsSource; private final int mUserPortalUrlSource;
/** @hide */ /** @hide */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@@ -65,7 +65,7 @@ public final class CaptivePortalData implements Parcelable {
private CaptivePortalData(long refreshTimeMillis, Uri userPortalUrl, Uri venueInfoUrl, private CaptivePortalData(long refreshTimeMillis, Uri userPortalUrl, Uri venueInfoUrl,
boolean isSessionExtendable, long byteLimit, long expiryTimeMillis, boolean captive, boolean isSessionExtendable, long byteLimit, long expiryTimeMillis, boolean captive,
String venueFriendlyName, int venueInfoUrlSource, int termsAndConditionsSource) { String venueFriendlyName, int venueInfoUrlSource, int userPortalUrlSource) {
mRefreshTimeMillis = refreshTimeMillis; mRefreshTimeMillis = refreshTimeMillis;
mUserPortalUrl = userPortalUrl; mUserPortalUrl = userPortalUrl;
mVenueInfoUrl = venueInfoUrl; mVenueInfoUrl = venueInfoUrl;
@@ -75,7 +75,7 @@ public final class CaptivePortalData implements Parcelable {
mCaptive = captive; mCaptive = captive;
mVenueFriendlyName = venueFriendlyName; mVenueFriendlyName = venueFriendlyName;
mVenueInfoUrlSource = venueInfoUrlSource; mVenueInfoUrlSource = venueInfoUrlSource;
mTermsAndConditionsSource = termsAndConditionsSource; mUserPortalUrlSource = userPortalUrlSource;
} }
private CaptivePortalData(Parcel p) { private CaptivePortalData(Parcel p) {
@@ -100,7 +100,7 @@ public final class CaptivePortalData implements Parcelable {
dest.writeBoolean(mCaptive); dest.writeBoolean(mCaptive);
dest.writeString(mVenueFriendlyName); dest.writeString(mVenueFriendlyName);
dest.writeInt(mVenueInfoUrlSource); dest.writeInt(mVenueInfoUrlSource);
dest.writeInt(mTermsAndConditionsSource); dest.writeInt(mUserPortalUrlSource);
} }
/** /**
@@ -130,7 +130,7 @@ public final class CaptivePortalData implements Parcelable {
public Builder(@Nullable CaptivePortalData data) { public Builder(@Nullable CaptivePortalData data) {
if (data == null) return; if (data == null) return;
setRefreshTime(data.mRefreshTimeMillis) setRefreshTime(data.mRefreshTimeMillis)
.setUserPortalUrl(data.mUserPortalUrl, data.mTermsAndConditionsSource) .setUserPortalUrl(data.mUserPortalUrl, data.mUserPortalUrlSource)
.setVenueInfoUrl(data.mVenueInfoUrl, data.mVenueInfoUrlSource) .setVenueInfoUrl(data.mVenueInfoUrl, data.mVenueInfoUrlSource)
.setSessionExtendable(data.mIsSessionExtendable) .setSessionExtendable(data.mIsSessionExtendable)
.setBytesRemaining(data.mByteLimit) .setBytesRemaining(data.mByteLimit)
@@ -314,7 +314,7 @@ public final class CaptivePortalData implements Parcelable {
* @return The source that the user portal URL was obtained from * @return The source that the user portal URL was obtained from
*/ */
public @CaptivePortalDataSource int getUserPortalUrlSource() { public @CaptivePortalDataSource int getUserPortalUrlSource() {
return mTermsAndConditionsSource; return mUserPortalUrlSource;
} }
/** /**
@@ -342,7 +342,7 @@ public final class CaptivePortalData implements Parcelable {
public int hashCode() { public int hashCode() {
return Objects.hash(mRefreshTimeMillis, mUserPortalUrl, mVenueInfoUrl, return Objects.hash(mRefreshTimeMillis, mUserPortalUrl, mVenueInfoUrl,
mIsSessionExtendable, mByteLimit, mExpiryTimeMillis, mCaptive, mVenueFriendlyName, mIsSessionExtendable, mByteLimit, mExpiryTimeMillis, mCaptive, mVenueFriendlyName,
mVenueInfoUrlSource, mTermsAndConditionsSource); mVenueInfoUrlSource, mUserPortalUrlSource);
} }
@Override @Override
@@ -358,7 +358,7 @@ public final class CaptivePortalData implements Parcelable {
&& mCaptive == other.mCaptive && mCaptive == other.mCaptive
&& Objects.equals(mVenueFriendlyName, other.mVenueFriendlyName) && Objects.equals(mVenueFriendlyName, other.mVenueFriendlyName)
&& mVenueInfoUrlSource == other.mVenueInfoUrlSource && mVenueInfoUrlSource == other.mVenueInfoUrlSource
&& mTermsAndConditionsSource == other.mTermsAndConditionsSource; && mUserPortalUrlSource == other.mUserPortalUrlSource;
} }
@Override @Override
@@ -373,7 +373,7 @@ public final class CaptivePortalData implements Parcelable {
+ ", captive: " + mCaptive + ", captive: " + mCaptive
+ ", venueFriendlyName: " + mVenueFriendlyName + ", venueFriendlyName: " + mVenueFriendlyName
+ ", venueInfoUrlSource: " + mVenueInfoUrlSource + ", venueInfoUrlSource: " + mVenueInfoUrlSource
+ ", termsAndConditionsSource: " + mTermsAndConditionsSource + ", userPortalUrlSource: " + mUserPortalUrlSource
+ "}"; + "}";
} }
} }