From a162ff05e0132acd6da9b254f42b68eb4b9ac27f Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 19 Jan 2021 02:33:00 +0000 Subject: [PATCH] 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/net/common/java/android/net/CaptivePortalDataTest.kt b/tests/net/common/java/android/net/CaptivePortalDataTest.kt index 2cb16d3372..b2bcfeb901 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())