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

Commit a8ae7054 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Add SDK version check to skip S added API test" am: 739195c5 

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

Change-Id: I40516d56f9ca477d62c362dbdf11aad713c620ae
parents 012a4243 739195c5

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

+11 −4
Original line number Diff line number Diff line
@@ -63,8 +63,10 @@ class NetworkAgentConfigTest { 
            setPartialConnectivityAcceptable(false)

            setUnvalidatedConnectivityAcceptable(true)

            setLegacyTypeName("TEST_NETWORK")

            if (isAtLeastS()) {

                setNat64DetectionEnabled(false)

                setProvisioningNotificationEnabled(false)

            }

        }.build()



        assertTrue(config.isExplicitlySelected())
@@ -73,7 +75,12 @@ class NetworkAgentConfigTest { 
        assertFalse(config.isPartialConnectivityAcceptable())

        assertTrue(config.isUnvalidatedConnectivityAcceptable())

        assertEquals("TEST_NETWORK", config.getLegacyTypeName())

        if (isAtLeastS()) {

            assertFalse(config.isNat64DetectionEnabled())

            assertFalse(config.isProvisioningNotificationEnabled())

        } else {

            assertTrue(config.isNat64DetectionEnabled())

            assertTrue(config.isProvisioningNotificationEnabled())

        }

    }

}