diff options
| author | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-08-31 02:31:15 +0000 |
|---|---|---|
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-08-31 02:31:15 +0000 |
| commit | 6980f3bbe4918f7dbf7b765d714faa960483ca71 (patch) | |
| tree | b5f396aaf4ec5bdc53eafb54ceb09bb9e1d0ac15 /tests/common/java/android/net/NetworkCapabilitiesTest.java | |
| parent | 6aec28e391d894bffd00879a045e64615bc832be (diff) | |
| parent | 81209cff57cca714a08b6f997cc3a29f53fae182 (diff) | |
[automerge] Do not verify field count in tests used in CTS 2p: 81209cff57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/19784418
Bug: 244275971
Bug: 205901761
Change-Id: I42521b414cdbc3e2fe1250794b0d8a0398b27d4d
Merged-In: Ie53474eecf0a836788ee15b45adc7a7980c12355
Merged-In: I79854741f7e834574d4825bb737ef507785310fe
Merged-In: Ib1701358f9058aeaaa336be8d074cfaa700c4309
Diffstat (limited to 'tests/common/java/android/net/NetworkCapabilitiesTest.java')
| -rw-r--r-- | tests/common/java/android/net/NetworkCapabilitiesTest.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tests/common/java/android/net/NetworkCapabilitiesTest.java b/tests/common/java/android/net/NetworkCapabilitiesTest.java index 9537786055..39a3941379 100644 --- a/tests/common/java/android/net/NetworkCapabilitiesTest.java +++ b/tests/common/java/android/net/NetworkCapabilitiesTest.java @@ -52,7 +52,6 @@ import static com.android.modules.utils.build.SdkLevel.isAtLeastS; import static com.android.net.module.util.NetworkCapabilitiesUtils.TRANSPORT_USB; import static com.android.testutils.MiscAsserts.assertEmpty; import static com.android.testutils.MiscAsserts.assertThrows; -import static com.android.testutils.ParcelUtils.assertParcelSane; import static com.android.testutils.ParcelUtils.assertParcelingIsLossless; import static org.junit.Assert.assertArrayEquals; @@ -341,13 +340,7 @@ public class NetworkCapabilitiesTest { } private void testParcelSane(NetworkCapabilities cap) { - if (isAtLeastS()) { - assertParcelSane(cap, 16); - } else if (isAtLeastR()) { - assertParcelSane(cap, 15); - } else { - assertParcelSane(cap, 11); - } + assertParcelingIsLossless(cap); } private static NetworkCapabilities createNetworkCapabilitiesWithTransportInfo() { |