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

Reland: CaptivePortalData: use CharSequence in VenueFriendlyName API

Browse Source 
Following up on feedback from API council, change the String type
to CharSequence in the get and set Venue friendly name API.

Bug: 179163405
Test: atest ConnectivityServiceTest CtsNetTestCasesLatestSdk:CaptivePortalDataTest
Test: atest NetworkNotificationManagerTest NetworkMonitorTest
Change-Id: Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97
This commit is contained in:
Hai Shalom
2021-03-16 20:59:42 -07:00
committed by Remi NGUYEN VAN
parent d9b56cea16
commit 60372ff53d
2 changed files with 7 additions and 7 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 String getVenueFriendlyName(); method @Nullable public CharSequence 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 String); method @NonNull public android.net.CaptivePortalData.Builder setVenueFriendlyName(@Nullable CharSequence);
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);
} }

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

@@ -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 userPortalUrlSource) { CharSequence venueFriendlyName, int venueInfoUrlSource, int userPortalUrlSource) {
mRefreshTimeMillis = refreshTimeMillis; mRefreshTimeMillis = refreshTimeMillis;
mUserPortalUrl = userPortalUrl; mUserPortalUrl = userPortalUrl;
mVenueInfoUrl = venueInfoUrl; mVenueInfoUrl = venueInfoUrl;
@@ -73,7 +73,7 @@ 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;
} }
@@ -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 String mVenueFriendlyName; private CharSequence 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 String venueFriendlyName) { public Builder setVenueFriendlyName(@Nullable CharSequence 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 String getVenueFriendlyName() { public CharSequence getVenueFriendlyName() {
return mVenueFriendlyName; return mVenueFriendlyName;
} }