commit 815cedfcbb8a481330198b785236cae73b6cb79d
author Yan Yan <evitayan@google.com> Fri Mar 31 04:16:22 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 31 04:16:22 2023 +0000
tree 39e58f604be0af3245f550a32e7ceacf70dd374f
parent 8b5ad258776b2ae94c0adebb2e6cf360b5d0e4c3
parent 51db40f5e5a0ff8110043e989917a6c1564fb770

Merge "Retain subscription IDs on restricted test networks" am: 51db40f5e5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2506442

Change-Id: Ia0a32684c36081d8ad364b5105a8829480e35c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

framework/src/android/net/NetworkCapabilities.java

diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java
index 6c0db54..df06b83 100644
--- a/framework/src/android/net/NetworkCapabilities.java
+++ b/framework/src/android/net/NetworkCapabilities.java
@@ -1134,14 +1134,16 @@
             mTransportTypes =
                     (originalTransportTypes & UNRESTRICTED_TEST_NETWORKS_ALLOWED_TRANSPORTS)
                             | (1 << TRANSPORT_TEST);
-
-            // SubIds are only allowed for Test Networks that only declare TRANSPORT_TEST.
-            setSubscriptionIds(originalSubIds);
         } else {
             // If the test network is restricted, then it may declare any transport.
             mTransportTypes = (originalTransportTypes | (1 << TRANSPORT_TEST));
         }
 
+        if (hasSingleTransport(TRANSPORT_TEST)) {
+            // SubIds are only allowed for Test Networks that only declare TRANSPORT_TEST.
+            setSubscriptionIds(originalSubIds);
+        }
+
         mNetworkCapabilities = originalCapabilities & TEST_NETWORKS_ALLOWED_CAPABILITIES;
         if (!hasTransport(TRANSPORT_CELLULAR)) {
             mNetworkCapabilities |=

tests/common/java/android/net/NetworkCapabilitiesTest.java

diff --git a/tests/common/java/android/net/NetworkCapabilitiesTest.java b/tests/common/java/android/net/NetworkCapabilitiesTest.java
index 06af3c0..aae3425 100644
--- a/tests/common/java/android/net/NetworkCapabilitiesTest.java
+++ b/tests/common/java/android/net/NetworkCapabilitiesTest.java
@@ -1387,6 +1387,9 @@
             // If the test network is restricted, then the network may declare any transport, and
             // appended with TRANSPORT_TEST.
             expectedNcBuilder.addTransportType(TRANSPORT_CELLULAR);
+        } else {
+            // If the test network only has TRANSPORT_TEST, then it can keep the subscription IDs.
+            expectedNcBuilder.setSubscriptionIds(Set.of(TEST_SUBID1));
         }
         expectedNcBuilder.addTransportType(TRANSPORT_TEST);