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

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

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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e3e891f2104c3363b7e6eb46c12486a76f93d50
parents 06d1d108 dc2c91f4

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

+2 −1
Original line number Diff line number Diff line
@@ -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())