From fd9d0e88555b5f5d3292e76c4f9c8a82a2fda179 Mon Sep 17 00:00:00 2001
From: Motomu Utsumi <motomuman@google.com>
Date: Wed, 21 Feb 2024 21:58:53 +0900
Subject: [PATCH] Make RedactedNetworkCapabilities compatible with upcoming
change
Upcoming change will make subIds public and not redacted but this change
will make cts fail.
So this CL updates test to be compatible with current code and code with
planned changes.
After the current cts support window is over, subIds can be public.
Bug: 324357121
Test: TH, TH with aosp/2969321
Change-Id: I45d39f5bc3b1c4af26cc990ce29b45e9ad7d3c3c
---
.../cts/net/src/android/net/cts/ConnectivityManagerTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index f0edee26ca..cdf83405a8 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -802,7 +802,9 @@ public class ConnectivityManagerTest {
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());
--
GitLab