[CM] Unhide the NetworkSpecifier as object API

API visibility change: unhide allowing NetworkSpecifier
to be an arbitrary object.

Bug: 27533960
Bug: 36053921
Bug: 36275276
Test: builds and runs
Change-Id: I1d1705cca7ece077ef8d7c674c62d5369fedbb03

5 files changed, 15 insertions, 3 deletions

diff --git a/api/current.txt b/api/current.txt
index 39642219b780..7c91bee9a055 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -24134,6 +24134,10 @@ package android.net {
     method public android.net.NetworkRequest.Builder removeCapability(int);
     method public android.net.NetworkRequest.Builder removeTransportType(int);
     method public android.net.NetworkRequest.Builder setNetworkSpecifier(java.lang.String);
+    method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier);
+  }
+
+  public abstract class NetworkSpecifier {
   }
 
   public class ParseException extends java.lang.RuntimeException {
diff --git a/api/system-current.txt b/api/system-current.txt
index 9d4794da3c4e..3c7584f63e5e 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -25997,6 +25997,7 @@ package android.net {
     method public android.net.NetworkRequest.Builder removeCapability(int);
     method public android.net.NetworkRequest.Builder removeTransportType(int);
     method public android.net.NetworkRequest.Builder setNetworkSpecifier(java.lang.String);
+    method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier);
   }
 
   public class NetworkScoreManager {
@@ -26016,6 +26017,9 @@ package android.net {
     field public static final java.lang.String EXTRA_PACKAGE_NAME = "packageName";
   }
 
+  public abstract class NetworkSpecifier {
+  }
+
   public class ParseException extends java.lang.RuntimeException {
     field public java.lang.String response;
   }
diff --git a/api/test-current.txt b/api/test-current.txt
index 1c6a41b241b7..dc2eb5af4b32 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -24207,6 +24207,10 @@ package android.net {
     method public android.net.NetworkRequest.Builder removeCapability(int);
     method public android.net.NetworkRequest.Builder removeTransportType(int);
     method public android.net.NetworkRequest.Builder setNetworkSpecifier(java.lang.String);
+    method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier);
+  }
+
+  public abstract class NetworkSpecifier {
   }
 
   public class ParseException extends java.lang.RuntimeException {
diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java
index 2c2d2701ce06..95a8bb472939 100644
--- a/core/java/android/net/NetworkRequest.java
+++ b/core/java/android/net/NetworkRequest.java
@@ -278,7 +278,6 @@ public class NetworkRequest implements Parcelable {
          *
          * @param networkSpecifier A concrete, parcelable framework class that extends
          *                         NetworkSpecifier.
-         * @hide
          */
         public Builder setNetworkSpecifier(NetworkSpecifier networkSpecifier) {
             MatchAllNetworkSpecifier.checkNotMatchAllNetworkSpecifier(networkSpecifier);
diff --git a/core/java/android/net/NetworkSpecifier.java b/core/java/android/net/NetworkSpecifier.java
index 1b9e39609955..87a2b05a4430 100644
--- a/core/java/android/net/NetworkSpecifier.java
+++ b/core/java/android/net/NetworkSpecifier.java
@@ -21,10 +21,11 @@ package android.net;
  *
  * Applications cannot instantiate this class by themselves, but can obtain instances of
  * subclasses of this class via other APIs.
- *
- * @hide
  */
 public abstract class NetworkSpecifier {
+    /** @hide */
+    public NetworkSpecifier() {}
+
     /**
      * Returns true if a request with this {@link NetworkSpecifier} is satisfied by a network
      * with the given NetworkSpecifier.