APIs to configure capabilities in VCN cell network template

This commit exposes APIs enabling caller to configure required
and forbidden capabilities in the VCN cell underlying network
template so that a cell network MUST match the capability
criteria to be selected as the VCN's underlying network.

Bug: 245618320
Test: make update-api && make
API-Coverage-Bug: 262448529
Change-Id: I3da7afab85f338f147707f724133a83fa08df4a5

2 files changed, 12 insertions, 12 deletions

diff --git a/core/api/current.txt b/core/api/current.txt
index 1578839f183f..364ec5a5ed77 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -27264,8 +27264,14 @@ package android.net.sip {
 package android.net.vcn {
 
   public final class VcnCellUnderlyingNetworkTemplate extends android.net.vcn.VcnUnderlyingNetworkTemplate {
+    method public int getCbs();
+    method public int getDun();
+    method public int getIms();
+    method public int getInternet();
+    method public int getMms();
     method @NonNull public java.util.Set<java.lang.String> getOperatorPlmnIds();
     method public int getOpportunistic();
+    method public int getRcs();
     method public int getRoaming();
     method @NonNull public java.util.Set<java.lang.Integer> getSimSpecificCarrierIds();
   }
@@ -27273,11 +27279,17 @@ package android.net.vcn {
   public static final class VcnCellUnderlyingNetworkTemplate.Builder {
     ctor public VcnCellUnderlyingNetworkTemplate.Builder();
     method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate build();
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setCbs(int);
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setDun(int);
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setIms(int);
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setInternet(int);
     method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setMetered(int);
     method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setMinDownstreamBandwidthKbps(int, int);
     method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setMinUpstreamBandwidthKbps(int, int);
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setMms(int);
     method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setOperatorPlmnIds(@NonNull java.util.Set<java.lang.String>);
     method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setOpportunistic(int);
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setRcs(int);
     method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setRoaming(int);
     method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setSimSpecificCarrierIds(@NonNull java.util.Set<java.lang.Integer>);
   }
diff --git a/core/java/android/net/vcn/VcnCellUnderlyingNetworkTemplate.java b/core/java/android/net/vcn/VcnCellUnderlyingNetworkTemplate.java
index 35f5e9e47f49..c3dba33ab881 100644
--- a/core/java/android/net/vcn/VcnCellUnderlyingNetworkTemplate.java
+++ b/core/java/android/net/vcn/VcnCellUnderlyingNetworkTemplate.java
@@ -300,7 +300,6 @@ public final class VcnCellUnderlyingNetworkTemplate extends VcnUnderlyingNetwork
      * Returns the matching criteria for CBS networks.
      *
      * @see Builder#setCbs(int)
-     * @hide
      */
     @MatchCriteria
     public int getCbs() {
@@ -311,7 +310,6 @@ public final class VcnCellUnderlyingNetworkTemplate extends VcnUnderlyingNetwork
      * Returns the matching criteria for DUN networks.
      *
      * @see Builder#setDun(int)
-     * @hide
      */
     @MatchCriteria
     public int getDun() {
@@ -321,7 +319,6 @@ public final class VcnCellUnderlyingNetworkTemplate extends VcnUnderlyingNetwork
      * Returns the matching criteria for IMS networks.
      *
      * @see Builder#setIms(int)
-     * @hide
      */
     @MatchCriteria
     public int getIms() {
@@ -331,7 +328,6 @@ public final class VcnCellUnderlyingNetworkTemplate extends VcnUnderlyingNetwork
      * Returns the matching criteria for INTERNET networks.
      *
      * @see Builder#setInternet(int)
-     * @hide
      */
     @MatchCriteria
     public int getInternet() {
@@ -341,7 +337,6 @@ public final class VcnCellUnderlyingNetworkTemplate extends VcnUnderlyingNetwork
      * Returns the matching criteria for MMS networks.
      *
      * @see Builder#setMms(int)
-     * @hide
      */
     @MatchCriteria
     public int getMms() {
@@ -352,7 +347,6 @@ public final class VcnCellUnderlyingNetworkTemplate extends VcnUnderlyingNetwork
      * Returns the matching criteria for RCS networks.
      *
      * @see Builder#setRcs(int)
-     * @hide
      */
     @MatchCriteria
     public int getRcs() {
@@ -612,7 +606,6 @@ public final class VcnCellUnderlyingNetworkTemplate extends VcnUnderlyingNetwork
          * @param matchCriteria the matching criteria for CBS networks. Defaults to {@link
          *     #MATCH_ANY}.
          * @see NetworkCapabilities#NET_CAPABILITY_CBS
-         * @hide
          */
         @NonNull
         public Builder setCbs(@MatchCriteria int matchCriteria) {
@@ -633,7 +626,6 @@ public final class VcnCellUnderlyingNetworkTemplate extends VcnUnderlyingNetwork
          * @param matchCriteria the matching criteria for DUN networks. Defaults to {@link
          *     #MATCH_ANY}.
          * @see NetworkCapabilities#NET_CAPABILITY_DUN
-         * @hide
          */
         @NonNull
         public Builder setDun(@MatchCriteria int matchCriteria) {
@@ -654,7 +646,6 @@ public final class VcnCellUnderlyingNetworkTemplate extends VcnUnderlyingNetwork
          * @param matchCriteria the matching criteria for IMS networks. Defaults to {@link
          *     #MATCH_ANY}.
          * @see NetworkCapabilities#NET_CAPABILITY_IMS
-         * @hide
          */
         @NonNull
         public Builder setIms(@MatchCriteria int matchCriteria) {
@@ -675,7 +666,6 @@ public final class VcnCellUnderlyingNetworkTemplate extends VcnUnderlyingNetwork
          * @param matchCriteria the matching criteria for INTERNET networks. Defaults to {@link
          *     #MATCH_REQUIRED}.
          * @see NetworkCapabilities#NET_CAPABILITY_INTERNET
-         * @hide
          */
         @NonNull
         public Builder setInternet(@MatchCriteria int matchCriteria) {
@@ -696,7 +686,6 @@ public final class VcnCellUnderlyingNetworkTemplate extends VcnUnderlyingNetwork
          * @param matchCriteria the matching criteria for MMS networks. Defaults to {@link
          *     #MATCH_ANY}.
          * @see NetworkCapabilities#NET_CAPABILITY_MMS
-         * @hide
          */
         @NonNull
         public Builder setMms(@MatchCriteria int matchCriteria) {
@@ -717,7 +706,6 @@ public final class VcnCellUnderlyingNetworkTemplate extends VcnUnderlyingNetwork
          * @param matchCriteria the matching criteria for RCS networks. Defaults to {@link
          *     #MATCH_ANY}.
          * @see NetworkCapabilities#NET_CAPABILITY_RCS
-         * @hide
          */
         @NonNull
         public Builder setRcs(@MatchCriteria int matchCriteria) {