summaryrefslogtreecommitdiff
path: root/tests/net/common
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2021-01-19 02:33:00 +0000
committerRemi NGUYEN VAN <reminv@google.com>2021-01-19 02:33:09 +0000
commite4954ca8adbc0820fcce73859b17708ec28e6fb4 (patch)
treea887e216847c7c8fc8c08ec76e0f949b445bacd9 /tests/net/common
parenta18490bdde09960b300e04ebb7c7a66652128423 (diff)
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
Diffstat (limited to 'tests/net/common')
-rw-r--r--tests/net/common/java/android/net/CaptivePortalDataTest.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/net/common/java/android/net/CaptivePortalDataTest.kt b/tests/net/common/java/android/net/CaptivePortalDataTest.kt
index 2cb16d3372d7..b2bcfeb9019d 100644
--- a/tests/net/common/java/android/net/CaptivePortalDataTest.kt
+++ b/tests/net/common/java/android/net/CaptivePortalDataTest.kt
@@ -58,7 +58,8 @@ class CaptivePortalDataTest {
@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())