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

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

Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf 

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

Change-Id: Ia433edec97f3a02c95dcf89f9f8ae80244063a89
parents 80b01a7f 3fbec7cf

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

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ class NetworkAgentConfigTest { 
            setSubscriberId("MySubId")

            setPartialConnectivityAcceptable(false)

            setUnvalidatedConnectivityAcceptable(true)

            if (isAtLeastS()) {

                setBypassableVpn(true)

            }

        }.build()

        if (isAtLeastS()) {

            // From S, the config will have 12 items
@@ -66,6 +69,7 @@ class NetworkAgentConfigTest { 
            if (isAtLeastS()) {

                setNat64DetectionEnabled(false)

                setProvisioningNotificationEnabled(false)

                setBypassableVpn(true)

            }

        }.build()
@@ -78,6 +82,7 @@ class NetworkAgentConfigTest { 
        if (isAtLeastS()) {

            assertFalse(config.isNat64DetectionEnabled())

            assertFalse(config.isProvisioningNotificationEnabled())

            assertTrue(config.isBypassableVpn())

        } else {

            assertTrue(config.isNat64DetectionEnabled())

            assertTrue(config.isProvisioningNotificationEnabled())