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

Merge "Use String in CaptivePortalData underlying types"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2021-04-09 00:17:59 +00:00
committed by Gerrit Code Review
parent ee638e2670 495d9ba693
commit 55d93ddb7e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ public final class CaptivePortalData implements Parcelable {
private final long mByteLimit; private final long mByteLimit;
private final long mExpiryTimeMillis; private final long mExpiryTimeMillis;
private final boolean mCaptive; private final boolean mCaptive;
private final CharSequence mVenueFriendlyName; private final String mVenueFriendlyName;
private final int mVenueInfoUrlSource; private final int mVenueInfoUrlSource;
private final int mUserPortalUrlSource; private final int mUserPortalUrlSource;
@@ -73,14 +73,14 @@ public final class CaptivePortalData implements Parcelable {
mByteLimit = byteLimit; mByteLimit = byteLimit;
mExpiryTimeMillis = expiryTimeMillis; mExpiryTimeMillis = expiryTimeMillis;
mCaptive = captive; mCaptive = captive;
mVenueFriendlyName = venueFriendlyName; mVenueFriendlyName = venueFriendlyName == null ? null : venueFriendlyName.toString();
mVenueInfoUrlSource = venueInfoUrlSource; mVenueInfoUrlSource = venueInfoUrlSource;
mUserPortalUrlSource = userPortalUrlSource; mUserPortalUrlSource = userPortalUrlSource;
} }
private CaptivePortalData(Parcel p) { private CaptivePortalData(Parcel p) {
this(p.readLong(), p.readParcelable(null), p.readParcelable(null), p.readBoolean(), this(p.readLong(), p.readParcelable(null), p.readParcelable(null), p.readBoolean(),
p.readLong(), p.readLong(), p.readBoolean(), p.readCharSequence(), p.readInt(), p.readLong(), p.readLong(), p.readBoolean(), p.readString(), p.readInt(),
p.readInt()); p.readInt());
} }
@@ -98,7 +98,7 @@ public final class CaptivePortalData implements Parcelable {
dest.writeLong(mByteLimit); dest.writeLong(mByteLimit);
dest.writeLong(mExpiryTimeMillis); dest.writeLong(mExpiryTimeMillis);
dest.writeBoolean(mCaptive); dest.writeBoolean(mCaptive);
dest.writeCharSequence(mVenueFriendlyName); dest.writeString(mVenueFriendlyName);
dest.writeInt(mVenueInfoUrlSource); dest.writeInt(mVenueInfoUrlSource);
dest.writeInt(mUserPortalUrlSource); dest.writeInt(mUserPortalUrlSource);
} }