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

Commit 97dbad03 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Use String in CaptivePortalData underlying types 

The venue friendly name comes from the network, and only plain strings
should be used in practice. writeCharSequence is also not usable in
CaptivePortalData, as it must build using module_api.

Use a String as the underlying type in CaptivePortalData, keeping
CharSequence in the API for consistency with UI-related elements.

This brings CaptivePortalData in line with downstream branches.

Bug: 183174863
Test: atest FrameworksNetTests
Merged-In: Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97
Change-Id: Ic662d3b546d52f825f9c3a24c5e0d4ba03818ab0
parent 544f3d52

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

+4 −4
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 CharSequence mVenueFriendlyName;

    private final String mVenueFriendlyName;

    private final int mVenueInfoUrlSource;

    private final int mUserPortalUrlSource;
@@ -73,14 +73,14 @@ public final class CaptivePortalData implements Parcelable { 
        mByteLimit = byteLimit;

        mExpiryTimeMillis = expiryTimeMillis;

        mCaptive = captive;

        mVenueFriendlyName = venueFriendlyName;

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

        mVenueInfoUrlSource = venueInfoUrlSource;

        mUserPortalUrlSource = userPortalUrlSource;

    }



    private CaptivePortalData(Parcel p) {

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

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

        dest.writeLong(mExpiryTimeMillis);

        dest.writeBoolean(mCaptive);

        dest.writeCharSequence(mVenueFriendlyName);

        dest.writeString(mVenueFriendlyName);

        dest.writeInt(mVenueInfoUrlSource);

        dest.writeInt(mUserPortalUrlSource);

    }