diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-31 08:43:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-31 08:43:29 +0000 |
| commit | 2cd16a209ab7cfaf5bfee4898125e367baf71f9b (patch) | |
| tree | ec3567f4b1bb6d00796d6839757284934fd626f1 /core/java/android | |
| parent | c564d5e583ebc269605f5b434d4671a56f3a1643 (diff) | |
| parent | a7d60e510397808eff6d5fa5c0f8a3064602dd9e (diff) | |
Merge "Make StringNetworkSpecifier @SystemApi" am: fbceb58514 am: a4fbf15adf am: a7d60e5103
Change-Id: Ia7e749b8953ce16a770dfe2a32e8407c6b22eecd
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/StringNetworkSpecifier.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/core/java/android/net/StringNetworkSpecifier.java b/core/java/android/net/StringNetworkSpecifier.java index 21dee55eb0fb..83dbc637fb65 100644 --- a/core/java/android/net/StringNetworkSpecifier.java +++ b/core/java/android/net/StringNetworkSpecifier.java @@ -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()); |