joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R"

Browse source
This commit is contained in:
Treehugger Robot 2021-01-19 04:45:08 +00:00 • committed by Gerrit Code Review
commit d806079674
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/net/common/java/android/net/CaptivePortalDataTest.kt
View file

@ -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())