From eef98503b8005d63f54abe255643629f6f72b14b Mon Sep 17 00:00:00 2001
From: Arsalan Khan <khanarsalan@google.com>
Date: Sat, 18 Jan 2020 00:23:51 +0000
Subject: Revert "Annotate StringNetworkSpecifier @Deprecated and @removed"

This reverts commit e35bc815b66739b027c002479798173bb1b25972.

Reason for revert: <Build Cop Triage b/147918881>

Change-Id: I6c675a3a245b10d3a0e7f3ebd7d59cf11cff007a
---
 api/system-current.txt                            |  9 +++++++++
 api/system-removed.txt                            | 12 ------------
 core/java/android/net/StringNetworkSpecifier.java | 11 +----------
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 9e776005231e..eed6d671b1e9 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4640,6 +4640,15 @@ 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 boolean satisfiedBy(android.net.NetworkSpecifier);
+    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 final class TelephonyNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
     method public boolean satisfiedBy(android.net.NetworkSpecifier);
   }
diff --git a/api/system-removed.txt b/api/system-removed.txt
index 57ee408c561c..5802f6cc09b6 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -130,18 +130,6 @@ package android.media.tv {
 
 }
 
-package android.net {
-
-  @Deprecated 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;
-  }
-
-}
-
 package android.net.wifi {
 
   @Deprecated public class BatchedScanResult implements android.os.Parcelable {
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 {
     /**
-- 
cgit v1.2.3-59-g8ed1b