diff options
| author | 2021-01-19 04:45:08 +0000 | |
|---|---|---|
| committer | 2021-01-19 04:45:08 +0000 | |
| commit | caa5817c335cbed511f2c4ca85cdb28340e2d152 (patch) | |
| tree | 14bbfc3faeac2da78f42784c562fa136caa50f81 | |
| parent | 58a2186be03bda1a93220386f20da2a1256acfb0 (diff) | |
| parent | e4954ca8adbc0820fcce73859b17708ec28e6fb4 (diff) | |
Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R"
| -rw-r--r-- | tests/net/common/java/android/net/CaptivePortalDataTest.kt | 3 |
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()) |