commit da94136cc7bbd0432f2a20aa3de2441782661a00
author Remi NGUYEN VAN <reminv@google.com> Tue Jan 19 02:33:00 2021 +0000
committer Remi NGUYEN VAN <reminv@google.com> Tue Jan 19 02:33:09 2021 +0000
tree e09baf1583b563198a9477512de3335d56031a5c
parent 95f07917247e465a58dce0d164dc2d7cbe743c39

Fix CaptivePortalDataTest#testParcelUnparcel on R

CaptivePortalData only has 7 fields on R, not 8.

Bug: 177290955
Change-Id: I156738d07821fee43420d8af14c4bce36dd0e4a4
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalDataTest 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())