From e53fbc08c930baa67869292637a806189b5bdbbb Mon Sep 17 00:00:00 2001
From: junyulai <junyulai@google.com>
Date: Thu, 11 Mar 2021 20:20:19 +0800
Subject: [PATCH] [VCN12] Expose setSubIds/getSubIds APIs

Test: atest NetworkCapabilitiesTest
Bug: 175662146
Change-Id: Ia4b98bc6c5fcefee44233f3b7fbb6517a0e8870e
---
 framework/api/current.txt                          | 2 ++
 framework/api/system-current.txt                   | 1 +
 framework/src/android/net/NetworkCapabilities.java | 3 ---
 framework/src/android/net/NetworkRequest.java      | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/framework/api/current.txt b/framework/api/current.txt
index a8f1a4d2a7..61ffaca5df 100644
--- a/framework/api/current.txt
+++ b/framework/api/current.txt
@@ -293,6 +293,7 @@ package android.net {
     method @Nullable public android.net.NetworkSpecifier getNetworkSpecifier();
     method public int getOwnerUid();
     method public int getSignalStrength();
+    method @NonNull public java.util.Set<java.lang.Integer> getSubIds();
     method @Nullable public android.net.TransportInfo getTransportInfo();
     method public boolean hasCapability(int);
     method public boolean hasTransport(int);
@@ -399,6 +400,7 @@ package android.net {
     method public android.net.NetworkRequest.Builder removeTransportType(int);
     method @Deprecated public android.net.NetworkRequest.Builder setNetworkSpecifier(String);
     method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier);
+    method @NonNull public android.net.NetworkRequest.Builder setSubIds(@NonNull java.util.Set<java.lang.Integer>);
   }
 
   public class ProxyInfo implements android.os.Parcelable {
diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt
index a732430e6a..a98f14ea94 100644
--- a/framework/api/system-current.txt
+++ b/framework/api/system-current.txt
@@ -296,6 +296,7 @@ package android.net {
     method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setRequestorUid(int);
     method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkCapabilities.Builder setSignalStrength(int);
     method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setSsid(@Nullable String);
+    method @NonNull public android.net.NetworkCapabilities.Builder setSubIds(@NonNull java.util.Set<java.lang.Integer>);
     method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo);
   }
 
diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java
index 73fbd614cb..4e1fd1c8a7 100644
--- a/framework/src/android/net/NetworkCapabilities.java
+++ b/framework/src/android/net/NetworkCapabilities.java
@@ -2284,7 +2284,6 @@ public final class NetworkCapabilities implements Parcelable {
 
     /**
      * Gets the subscription ID set that associated to this network or request.
-     * @hide
      * @return
      */
     @NonNull
@@ -2637,8 +2636,6 @@ public final class NetworkCapabilities implements Parcelable {
          *
          * @param subIds a set that represent the subscription IDs. Empty if clean up.
          * @return this builder.
-         *
-         * @hide
          */
         @NonNull
         public Builder setSubIds(@NonNull final Set<Integer> subIds) {
diff --git a/framework/src/android/net/NetworkRequest.java b/framework/src/android/net/NetworkRequest.java
index 65ca1b2f7d..960d967275 100644
--- a/framework/src/android/net/NetworkRequest.java
+++ b/framework/src/android/net/NetworkRequest.java
@@ -465,8 +465,6 @@ public class NetworkRequest implements Parcelable {
          * An empty set matches all networks, including those without a subId.
          *
          * @param subIds A {@code Set} that represents subscription IDs.
-         *
-         * @hide
          */
         @NonNull
         public Builder setSubIds(@NonNull Set<Integer> subIds) {