diff options
| author | Motomu Utsumi <motomuman@google.com> | 2024-02-21 21:58:53 +0900 |
|---|---|---|
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2024-02-29 03:27:15 +0000 |
| commit | ca2aded8073111167e0654f8c87b0b4cf3a9d3f4 (patch) | |
| tree | 7b238bce17e3943cb18446b898484faeea198978 | |
| parent | 5079d145506d6c8081f811168ea26f9b3663b9bd (diff) | |
| download | Connectivity-android13-tests-dev.tar.gz | |
Make RedactedNetworkCapabilities compatible with upcoming changeandroid13-tests-dev
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
(cherry picked from https://android-review.googlesource.com/q/commit:fd9d0e88555b5f5d3292e76c4f9c8a82a2fda179)
Merged-In: I45d39f5bc3b1c4af26cc990ce29b45e9ad7d3c3c
Change-Id: I45d39f5bc3b1c4af26cc990ce29b45e9ad7d3c3c
| -rw-r--r-- | tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 0e9c16da6c..d1e6c3ff1a 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -763,7 +763,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()); |