Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make StringNetworkSpecifier @SystemApi"

Browse Source
This commit is contained in:
Aaron Huang
2019-12-31 08:11:48 +00:00
committed by Gerrit Code Review
parent 4bef55860f 743a79e2ba
commit fbceb58514
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/system-current.txt
View File

@@ -4483,6 +4483,14 @@ package android.net {
method @NonNull public android.net.StaticIpConfiguration.Builder setIpAddress(@Nullable android.net.LinkAddress); 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 { public class TrafficStats {
method public static void setThreadStatsTagApp(); method public static void setThreadStatsTagApp();
method public static void setThreadStatsTagBackup(); method public static void setThreadStatsTagBackup();

13
core/java/android/net/StringNetworkSpecifier.java
View File

@@ -16,7 +16,8 @@
package android.net; package android.net;
import android.annotation.UnsupportedAppUsage; import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.text.TextUtils; import android.text.TextUtils;
@@ -26,18 +27,20 @@ import com.android.internal.util.Preconditions;
import java.util.Objects; import java.util.Objects;
/** @hide */ /** @hide */
@SystemApi
public final class StringNetworkSpecifier extends NetworkSpecifier implements Parcelable { public final class StringNetworkSpecifier extends NetworkSpecifier implements Parcelable {
/** /**
* Arbitrary string used to pass (additional) information to the network factory. * Arbitrary string used to pass (additional) information to the network factory.
*/ */
@UnsupportedAppUsage @NonNull
public final String specifier; public final String specifier;
public StringNetworkSpecifier(String specifier) { public StringNetworkSpecifier(@NonNull String specifier) {
Preconditions.checkStringNotEmpty(specifier); Preconditions.checkStringNotEmpty(specifier);
this.specifier = specifier; this.specifier = specifier;
} }
/** @hide */
@Override @Override
public boolean satisfiedBy(NetworkSpecifier other) { public boolean satisfiedBy(NetworkSpecifier other) {
return equals(other); return equals(other);
@@ -65,11 +68,11 @@ public final class StringNetworkSpecifier extends NetworkSpecifier implements Pa
} }
@Override @Override
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(@NonNull Parcel dest, int flags) {
dest.writeString(specifier); 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>() { new Parcelable.Creator<StringNetworkSpecifier>() {
public StringNetworkSpecifier createFromParcel(Parcel in) { public StringNetworkSpecifier createFromParcel(Parcel in) {
return new StringNetworkSpecifier(in.readString()); return new StringNetworkSpecifier(in.readString());