commit d806079674f1978e431787e34b6d309e240e3c05
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 19 04:45:08 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 19 04:45:08 2021 +0000
tree a2e11f3dd18b5f978acc6c4ca1eece914592a345
parent 4fcb0e54a14fce4639a4b673bb819271176deb1b
parent da94136cc7bbd0432f2a20aa3de2441782661a00

Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R"

tests/net/common/java/android/net/CaptivePortalDataTest.kt

diff --git a/tests/net/common/java/android/net/CaptivePortalDataTest.kt b/tests/net/common/java/android/net/CaptivePortalDataTest.kt
index 2cb16d3..b2bcfeb 100644
--- a/tests/net/common/java/android/net/CaptivePortalDataTest.kt
+++ b/tests/net/common/java/android/net/CaptivePortalDataTest.kt
@@ -58,7 +58,8 @@
 
     @Test
     fun testParcelUnparcel() {
-        assertParcelSane(data, fieldCount = 8)
+        val fieldCount = if (SdkLevel.isAtLeastS()) 8 else 7
+        assertParcelSane(data, fieldCount)
 
         assertParcelingIsLossless(makeBuilder().setUserPortalUrl(null).build())
         assertParcelingIsLossless(makeBuilder().setVenueInfoUrl(null).build())