LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add CTS test for API setLegacyExtraInfo" am: 3103a318bf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719131

Change-Id: I2cab45cff92215389eb6bba7b14270e3329d600d
This commit is contained in:
Frank Li
2021-06-08 11:28:34 +00:00
committed by Automerger Merge Worker
parent f9074acfa3 3103a318bf
commit 1cccc8db0e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/common/java/android/net/NetworkAgentConfigTest.kt
View File

@@ -59,6 +59,7 @@ class NetworkAgentConfigTest {
@Test @IgnoreUpTo(Build.VERSION_CODES.Q) @Test @IgnoreUpTo(Build.VERSION_CODES.Q)
fun testBuilder() { fun testBuilder() {
val testExtraInfo = "mylegacyExtraInfo"
val config = NetworkAgentConfig.Builder().apply { val config = NetworkAgentConfig.Builder().apply {
setExplicitlySelected(true) setExplicitlySelected(true)
setLegacyType(ConnectivityManager.TYPE_ETHERNET) setLegacyType(ConnectivityManager.TYPE_ETHERNET)
@@ -67,6 +68,7 @@ class NetworkAgentConfigTest {
setUnvalidatedConnectivityAcceptable(true) setUnvalidatedConnectivityAcceptable(true)
setLegacyTypeName("TEST_NETWORK") setLegacyTypeName("TEST_NETWORK")
if (isAtLeastS()) { if (isAtLeastS()) {
setLegacyExtraInfo(testExtraInfo)
setNat64DetectionEnabled(false) setNat64DetectionEnabled(false)
setProvisioningNotificationEnabled(false) setProvisioningNotificationEnabled(false)
setBypassableVpn(true) setBypassableVpn(true)
@@ -80,6 +82,7 @@ class NetworkAgentConfigTest {
assertTrue(config.isUnvalidatedConnectivityAcceptable()) assertTrue(config.isUnvalidatedConnectivityAcceptable())
assertEquals("TEST_NETWORK", config.getLegacyTypeName()) assertEquals("TEST_NETWORK", config.getLegacyTypeName())
if (isAtLeastS()) { if (isAtLeastS()) {
assertEquals(testExtraInfo, config.getLegacyExtraInfo())
assertFalse(config.isNat64DetectionEnabled()) assertFalse(config.isNat64DetectionEnabled())
assertFalse(config.isProvisioningNotificationEnabled()) assertFalse(config.isProvisioningNotificationEnabled())
assertTrue(config.isBypassableVpn()) assertTrue(config.isBypassableVpn())