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

Commit 4bdea2a2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: 47157e77 

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

Change-Id: I26db95ad9d91dec40a62b7e4c4c0b77133ddb5d3
parents 6d208315 47157e77

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

+7 −7
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public final class CaptivePortalData implements Parcelable { 
    private final long mByteLimit;

    private final long mExpiryTimeMillis;

    private final boolean mCaptive;

    private final String mVenueFriendlyName;

    private final CharSequence mVenueFriendlyName;

    private final int mVenueInfoUrlSource;

    private final int mUserPortalUrlSource;
@@ -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;
@@ -80,7 +80,7 @@ public final class CaptivePortalData implements Parcelable { 


    private CaptivePortalData(Parcel p) {

        this(p.readLong(), p.readParcelable(null), p.readParcelable(null), p.readBoolean(),

                p.readLong(), p.readLong(), p.readBoolean(), p.readString(), p.readInt(),

                p.readLong(), p.readLong(), p.readBoolean(), p.readCharSequence(), p.readInt(),

                p.readInt());

    }
@@ -98,7 +98,7 @@ public final class CaptivePortalData implements Parcelable { 
        dest.writeLong(mByteLimit);

        dest.writeLong(mExpiryTimeMillis);

        dest.writeBoolean(mCaptive);

        dest.writeString(mVenueFriendlyName);

        dest.writeCharSequence(mVenueFriendlyName);

        dest.writeInt(mVenueInfoUrlSource);

        dest.writeInt(mUserPortalUrlSource);

    }
@@ -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();