diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-09-01 12:12:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-09-01 12:12:27 +0000 |
| commit | d0bb953892522d1b2f6f046e8bdae2d18deed347 (patch) | |
| tree | eca2e08ab46d57fd53f671805f885a90119c4dab /tests/common/java/android/net/NetworkCapabilitiesTest.java | |
| parent | e589cad06e661c42eef47be467989e0d6f4a9262 (diff) | |
| parent | 6980f3bbe4918f7dbf7b765d714faa960483ca71 (diff) | |
Merge changes from topic "presubmit-am-25573e946ece4fa1804202119abb6474-sc-dev" into sc-qpr1-dev
* changes:
[automerge] Do not verify field count in tests used in CTS 2p: 81209cff57
Do not verify field count in tests used in CTS
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 4ed705929c..1b5b467b0b 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; @@ -333,13 +332,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() { |