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

Revert "CaptivePortalData: use CharSequence in VenueFriendlyName API"

Browse Source 
This reverts commit 6ae29ff41a.

Reason for revert: b/183174863
Bug: 183174863

Change-Id: I4db923e112bba149f4e8eb4cfa8c3f97defd5e63
This commit is contained in:
Remi NGUYEN VAN
2021-03-19 08:00:25 +00:00
parent 6ae29ff41a
commit d9b56cea16
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/api/system-current.txt
View File

@@ -18,7 +18,7 @@ package android.net {
method public long getRefreshTimeMillis(); method public long getRefreshTimeMillis();
method @Nullable public android.net.Uri getUserPortalUrl(); method @Nullable public android.net.Uri getUserPortalUrl();
method public int getUserPortalUrlSource(); method public int getUserPortalUrlSource();
method @Nullable public CharSequence getVenueFriendlyName(); method @Nullable public String getVenueFriendlyName();
method @Nullable public android.net.Uri getVenueInfoUrl(); method @Nullable public android.net.Uri getVenueInfoUrl();
method public int getVenueInfoUrlSource(); method public int getVenueInfoUrlSource();
method public boolean isCaptive(); method public boolean isCaptive();
@@ -40,7 +40,7 @@ package android.net {
method @NonNull public android.net.CaptivePortalData.Builder setSessionExtendable(boolean); method @NonNull public android.net.CaptivePortalData.Builder setSessionExtendable(boolean);
method @NonNull public android.net.CaptivePortalData.Builder setUserPortalUrl(@Nullable android.net.Uri); method @NonNull public android.net.CaptivePortalData.Builder setUserPortalUrl(@Nullable android.net.Uri);
method @NonNull public android.net.CaptivePortalData.Builder setUserPortalUrl(@Nullable android.net.Uri, int); method @NonNull public android.net.CaptivePortalData.Builder setUserPortalUrl(@Nullable android.net.Uri, int);
method @NonNull public android.net.CaptivePortalData.Builder setVenueFriendlyName(@Nullable CharSequence); method @NonNull public android.net.CaptivePortalData.Builder setVenueFriendlyName(@Nullable String);
method @NonNull public android.net.CaptivePortalData.Builder setVenueInfoUrl(@Nullable android.net.Uri); method @NonNull public android.net.CaptivePortalData.Builder setVenueInfoUrl(@Nullable android.net.Uri);
method @NonNull public android.net.CaptivePortalData.Builder setVenueInfoUrl(@Nullable android.net.Uri, int); method @NonNull public android.net.CaptivePortalData.Builder setVenueInfoUrl(@Nullable android.net.Uri, int);
} }

14
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;
@@ -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,
CharSequence venueFriendlyName, int venueInfoUrlSource, int userPortalUrlSource) { String venueFriendlyName, int venueInfoUrlSource, int userPortalUrlSource) {
mRefreshTimeMillis = refreshTimeMillis; mRefreshTimeMillis = refreshTimeMillis;
mUserPortalUrl = userPortalUrl; mUserPortalUrl = userPortalUrl;
mVenueInfoUrl = venueInfoUrl; mVenueInfoUrl = venueInfoUrl;
@@ -80,7 +80,7 @@ public final class CaptivePortalData implements Parcelable {
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);
} }
@@ -114,7 +114,7 @@ public final class CaptivePortalData implements Parcelable {
private long mBytesRemaining = -1; private long mBytesRemaining = -1;
private long mExpiryTime = -1; private long mExpiryTime = -1;
private boolean mCaptive; private boolean mCaptive;
private CharSequence mVenueFriendlyName; private String mVenueFriendlyName;
private @CaptivePortalDataSource int mVenueInfoUrlSource = CAPTIVE_PORTAL_DATA_SOURCE_OTHER; private @CaptivePortalDataSource int mVenueInfoUrlSource = CAPTIVE_PORTAL_DATA_SOURCE_OTHER;
private @CaptivePortalDataSource int mUserPortalUrlSource = private @CaptivePortalDataSource int mUserPortalUrlSource =
CAPTIVE_PORTAL_DATA_SOURCE_OTHER; CAPTIVE_PORTAL_DATA_SOURCE_OTHER;
@@ -228,7 +228,7 @@ public final class CaptivePortalData implements Parcelable {
* Set the venue friendly name. * Set the venue friendly name.
*/ */
@NonNull @NonNull
public Builder setVenueFriendlyName(@Nullable CharSequence venueFriendlyName) { public Builder setVenueFriendlyName(@Nullable String venueFriendlyName) {
mVenueFriendlyName = venueFriendlyName; mVenueFriendlyName = venueFriendlyName;
return this; return this;
} }
@@ -321,7 +321,7 @@ public final class CaptivePortalData implements Parcelable {
* Get the venue friendly name * Get the venue friendly name
*/ */
@Nullable @Nullable
public CharSequence getVenueFriendlyName() { public String getVenueFriendlyName() {
return mVenueFriendlyName; return mVenueFriendlyName;
} }