From d38b96e9b334b827b7512e3af286dcc24f303156 Mon Sep 17 00:00:00 2001
From: Nathan Harold <nharold@google.com>
Date: Tue, 21 Jan 2020 18:09:26 -0800
Subject: [PATCH] Remove StringNetworkSpecifier

Due to issues with @Deprecated @removed, manually remove
StringNetworkSpecifier. This API was never in any released
API surface; it was planned to be added in R; however, the
need was superseded by TelephonyNetworkSpecifier.

"Aaaaand it's gone!"

Bug: 147441267
Test: make aosp_bramble-userdebug
Change-Id: I9bae68a60f3cdb77203ba61ea8a08f64e597cf08
---
 api/system-current.txt                            | 9 ---------
 core/java/android/net/StringNetworkSpecifier.java | 2 --
 2 files changed, 11 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 4afb29b45a557..c1bee063dd02a 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4640,15 +4640,6 @@ 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/core/java/android/net/StringNetworkSpecifier.java b/core/java/android/net/StringNetworkSpecifier.java
index 83dbc637fb65b..6ae59716cfd89 100644
--- a/core/java/android/net/StringNetworkSpecifier.java
+++ b/core/java/android/net/StringNetworkSpecifier.java
@@ -17,7 +17,6 @@
 package android.net;
 
 import android.annotation.NonNull;
-import android.annotation.SystemApi;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
@@ -27,7 +26,6 @@ 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.