From d776b3762ee81f09424fce0f9b30f4e857d227bb Mon Sep 17 00:00:00 2001
From: Benedict Wong <benedictwong@google.com>
Date: Tue, 20 Apr 2021 15:14:31 -0700
Subject: [PATCH] Expose API for retrieval of subscription groups with VCN
 configured

Per API council feedback, this change adds a new API to retrieve all
subscription groups that have a VCN configured.

Bug: 184612525
Test: atest FrameworksVcnTests
Test: atest CtsVcnTestCases
Change-Id: I64b565758e0a27552eee9f860e0674db2fb35980
---
 core/api/current.txt                      | 1 +
 core/java/android/net/vcn/VcnManager.java | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 2a16084f348ea..c0bdcdb2ab11d 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -25722,6 +25722,7 @@ package android.net.vcn {
 
   public class VcnManager {
     method @RequiresPermission("carrier privileges") public void clearVcnConfig(@NonNull android.os.ParcelUuid) throws java.io.IOException;
+    method @NonNull public java.util.List<android.os.ParcelUuid> getConfiguredSubscriptionGroups();
     method public void registerVcnStatusCallback(@NonNull android.os.ParcelUuid, @NonNull java.util.concurrent.Executor, @NonNull android.net.vcn.VcnManager.VcnStatusCallback);
     method @RequiresPermission("carrier privileges") public void setVcnConfig(@NonNull android.os.ParcelUuid, @NonNull android.net.vcn.VcnConfig) throws java.io.IOException;
     method public void unregisterVcnStatusCallback(@NonNull android.net.vcn.VcnManager.VcnStatusCallback);
diff --git a/core/java/android/net/vcn/VcnManager.java b/core/java/android/net/vcn/VcnManager.java
index 1cd4ff0a5c260..9d1c1ff898e71 100644
--- a/core/java/android/net/vcn/VcnManager.java
+++ b/core/java/android/net/vcn/VcnManager.java
@@ -170,7 +170,6 @@ public class VcnManager {
      * privileged, and which have an associated {@link VcnConfig}.
      *
      * @throws SecurityException if the caller is not running as the primary user
-     * @hide
      */
     @NonNull
     public List<ParcelUuid> getConfiguredSubscriptionGroups() {