commit f0082bb7670d1d62b89e2a45666e58b0b46c60c9
author Motomu Utsumi <motomuman@google.com> Tue Mar 05 08:30:38 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 05 08:30:38 2024 +0000
tree 259a779cd1945edc95f0070fdf2b5ce2fd5058de
parent 927714a4446d8657490bc94493aa9ae7ca351200
parent 27344dbd2155eaf7f3462a1d83567d30591ef480

Merge "Make RedactedNetworkCapabilities compatible with upcoming change" into android14-tests-dev

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 4451a88..a4a8216 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -799,7 +799,9 @@
             assertNull(redactedNormal.getUids());
             assertNull(redactedNormal.getSsid());
             assertNull(redactedNormal.getUnderlyingNetworks());
-            assertEquals(0, redactedNormal.getSubscriptionIds().size());
+            // TODO: Make subIds public and update to verify the size is 2
+            final int subIdsSize = redactedNormal.getSubscriptionIds().size();
+            assertTrue(subIdsSize == 0 || subIdsSize == 2);
             assertEquals(WifiInfo.DEFAULT_MAC_ADDRESS,
                     ((WifiInfo) redactedNormal.getTransportInfo()).getBSSID());
             assertEquals(rssi, ((WifiInfo) redactedNormal.getTransportInfo()).getRssi());