diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-18 20:44:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-18 20:44:05 +0000 |
| commit | 6011b4e780a791f917b3a8e924e4e6ec057eaac6 (patch) | |
| tree | 832d68b702918c5012f9de21b63ef9f4a3f8ae90 /core/java | |
| parent | eb368aed7f1acb0cf0c1046f80432f3ba43ff6a3 (diff) | |
| parent | dd2a5c7c6980c3129fa0c94ad25fa57bc48790df (diff) | |
Merge "Revert "Annotate StringNetworkSpecifier @Deprecated and @removed"" am: 1413b254eb am: dd2a5c7c69
Change-Id: Ia4912e6328ee83b0d8ecaf7f97833c180f7d3055
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/StringNetworkSpecifier.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/core/java/android/net/StringNetworkSpecifier.java b/core/java/android/net/StringNetworkSpecifier.java index 530c84a8f3f0..83dbc637fb65 100644 --- a/core/java/android/net/StringNetworkSpecifier.java +++ b/core/java/android/net/StringNetworkSpecifier.java @@ -26,16 +26,7 @@ import com.android.internal.util.Preconditions; import java.util.Objects; -/** - * @deprecated use other subclass of {@link android.net.NetworkSpecifier}, - * eg. {@link android.net.TelephonyNetworkSpecifier}, - * {@link android.net.wifi.WifiNetworkSpecifier} instead. - * @see {@link android.net.NetworkRequest#setNetworkSpecifier(String)} for details. - * @removed this class was tentatively made SystemApi in December 2019 in the scramble for - * publishing mainline APIs, it should be removed before R release is published. - * @hide - */ -@Deprecated +/** @hide */ @SystemApi public final class StringNetworkSpecifier extends NetworkSpecifier implements Parcelable { /** |