Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70378026 authored by Chalard Jean's avatar Chalard Jean Committed by Android (Google) Code Review
Browse files

Merge "Reland: CaptivePortalData: use CharSequence in VenueFriendlyName API" into sc-dev

parents 5ebb78ad 8d3d5456

packages/Connectivity/framework/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.net { 
    method public long getRefreshTimeMillis();

    method @Nullable public android.net.Uri getUserPortalUrl();

    method public int getUserPortalUrlSource();

    method @Nullable public String getVenueFriendlyName();

    method @Nullable public CharSequence getVenueFriendlyName();

    method @Nullable public android.net.Uri getVenueInfoUrl();

    method public int getVenueInfoUrlSource();

    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 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 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, int);

  }

packages/Connectivity/framework/src/android/net/CaptivePortalData.java

+5 −5
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public final class CaptivePortalData implements Parcelable { 


    private CaptivePortalData(long refreshTimeMillis, Uri userPortalUrl, Uri venueInfoUrl,

            boolean isSessionExtendable, long byteLimit, long expiryTimeMillis, boolean captive,

            String venueFriendlyName, int venueInfoUrlSource, int userPortalUrlSource) {

            CharSequence venueFriendlyName, int venueInfoUrlSource, int userPortalUrlSource) {

        mRefreshTimeMillis = refreshTimeMillis;

        mUserPortalUrl = userPortalUrl;

        mVenueInfoUrl = venueInfoUrl;
@@ -73,7 +73,7 @@ public final class CaptivePortalData implements Parcelable { 
        mByteLimit = byteLimit;

        mExpiryTimeMillis = expiryTimeMillis;

        mCaptive = captive;

        mVenueFriendlyName = venueFriendlyName;

        mVenueFriendlyName = venueFriendlyName == null ? null : venueFriendlyName.toString();

        mVenueInfoUrlSource = venueInfoUrlSource;

        mUserPortalUrlSource = userPortalUrlSource;

    }
@@ -114,7 +114,7 @@ public final class CaptivePortalData implements Parcelable { 
        private long mBytesRemaining = -1;

        private long mExpiryTime = -1;

        private boolean mCaptive;

        private String mVenueFriendlyName;

        private CharSequence mVenueFriendlyName;

        private @CaptivePortalDataSource int mVenueInfoUrlSource = CAPTIVE_PORTAL_DATA_SOURCE_OTHER;

        private @CaptivePortalDataSource int mUserPortalUrlSource =

                CAPTIVE_PORTAL_DATA_SOURCE_OTHER;
@@ -228,7 +228,7 @@ public final class CaptivePortalData implements Parcelable { 
         * Set the venue friendly name.

         */

        @NonNull

        public Builder setVenueFriendlyName(@Nullable String venueFriendlyName) {

        public Builder setVenueFriendlyName(@Nullable CharSequence venueFriendlyName) {

            mVenueFriendlyName = venueFriendlyName;

            return this;

        }
@@ -321,7 +321,7 @@ public final class CaptivePortalData implements Parcelable { 
     * Get the venue friendly name

     */

    @Nullable

    public String getVenueFriendlyName() {

    public CharSequence getVenueFriendlyName() {

        return mVenueFriendlyName;

    }

services/core/java/com/android/server/connectivity/NetworkNotificationManager.java

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public class NetworkNotificationManager { 
        final String tag = tagFor(id);

        final int eventId = notifyType.eventId;

        final int transportType;

        final String name;

        final CharSequence name;

        if (nai != null) {

            transportType = approximateTransportType(nai);

            final String extraInfo = nai.networkInfo.getExtraInfo();