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

Commit fbceb585 authored by Aaron Huang's avatar Aaron Huang Committed by Gerrit Code Review
Browse files

Merge "Make StringNetworkSpecifier @SystemApi"

parents 4bef5586 743a79e2

api/system-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -4483,6 +4483,14 @@ package android.net { 
    method @NonNull public android.net.StaticIpConfiguration.Builder setIpAddress(@Nullable android.net.LinkAddress);

  }













  public final class StringNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {













    ctor public StringNetworkSpecifier(@NonNull String);













    method public int describeContents();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.StringNetworkSpecifier> CREATOR;













    field @NonNull public final String specifier;













  }



























  public class TrafficStats {















    method public static void setThreadStatsTagApp();















    method public static void setThreadStatsTagBackup();

































core/java/android/net/StringNetworkSpecifier.java



+8
−5




























Original line number
Diff line number
Diff line








@@ -16,7 +16,8 @@





























package android.net;





























import android.annotation.UnsupportedAppUsage;













import android.annotation.NonNull;













import android.annotation.SystemApi;















import android.os.Parcel;















import android.os.Parcelable;















import android.text.TextUtils;









@@ -26,18 +27,20 @@ import com.android.internal.util.Preconditions;













import java.util.Objects;































/** @hide */













@SystemApi















public final class StringNetworkSpecifier extends NetworkSpecifier implements Parcelable {















    /**















     * Arbitrary string used to pass (additional) information to the network factory.















     */













    @UnsupportedAppUsage













    @NonNull















    public final String specifier;





























    public StringNetworkSpecifier(String specifier) {













    public StringNetworkSpecifier(@NonNull String specifier) {















        Preconditions.checkStringNotEmpty(specifier);















        this.specifier = specifier;















    }





























    /** @hide */















    @Override















    public boolean satisfiedBy(NetworkSpecifier other) {















        return equals(other);










@@ -65,11 +68,11 @@ public final class StringNetworkSpecifier extends NetworkSpecifier implements Pa













    }































    @Override













    public void writeToParcel(Parcel dest, int flags) {













    public void writeToParcel(@NonNull Parcel dest, int flags) {















        dest.writeString(specifier);















    }





























    public static final @android.annotation.NonNull Parcelable.Creator<StringNetworkSpecifier> CREATOR =













    public static final @NonNull Parcelable.Creator<StringNetworkSpecifier> CREATOR =















            new Parcelable.Creator<StringNetworkSpecifier>() {















        public StringNetworkSpecifier createFromParcel(Parcel in) {















            return new StringNetworkSpecifier(in.readString());