Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8a4a460 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: caa5817c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74a6492618ca1e21e35474c012dee9886239e75a
parents 6ff1005d caa5817c

tests/net/common/java/android/net/CaptivePortalDataTest.kt

+2 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,8 @@ class CaptivePortalDataTest { 




    @Test

    @Test

    fun testParcelUnparcel() {

    fun testParcelUnparcel() {

        assertParcelSane(data, fieldCount = 8)

        val fieldCount = if (SdkLevel.isAtLeastS()) 8 else 7

        assertParcelSane(data, fieldCount)





        assertParcelingIsLossless(makeBuilder().setUserPortalUrl(null).build())

        assertParcelingIsLossless(makeBuilder().setUserPortalUrl(null).build())

        assertParcelingIsLossless(makeBuilder().setVenueInfoUrl(null).build())

        assertParcelingIsLossless(makeBuilder().setVenueInfoUrl(null).build())