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

Merge "Add SDK version check to skip S added API test" am: 045961b828

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

Change-Id: I40516d56f9ca477d62c362dbdf11aad713c620ae
This commit is contained in:
Chiachang Wang
2021-04-13 05:17:53 +00:00
committed by Automerger Merge Worker
parent f37ac683f9 045961b828
commit 97247ff9a3
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,8 +63,10 @@ class NetworkAgentConfigTest {
setPartialConnectivityAcceptable(false) setPartialConnectivityAcceptable(false)
setUnvalidatedConnectivityAcceptable(true) setUnvalidatedConnectivityAcceptable(true)
setLegacyTypeName("TEST_NETWORK") setLegacyTypeName("TEST_NETWORK")
setNat64DetectionEnabled(false) if (isAtLeastS()) {
setProvisioningNotificationEnabled(false) setNat64DetectionEnabled(false)
setProvisioningNotificationEnabled(false)
}
}.build() }.build()
assertTrue(config.isExplicitlySelected()) assertTrue(config.isExplicitlySelected())
@@ -73,7 +75,12 @@ class NetworkAgentConfigTest {
assertFalse(config.isPartialConnectivityAcceptable()) assertFalse(config.isPartialConnectivityAcceptable())
assertTrue(config.isUnvalidatedConnectivityAcceptable()) assertTrue(config.isUnvalidatedConnectivityAcceptable())
assertEquals("TEST_NETWORK", config.getLegacyTypeName()) assertEquals("TEST_NETWORK", config.getLegacyTypeName())
assertFalse(config.isNat64DetectionEnabled()) if (isAtLeastS()) {
assertFalse(config.isProvisioningNotificationEnabled()) assertFalse(config.isNat64DetectionEnabled())
assertFalse(config.isProvisioningNotificationEnabled())
} else {
assertTrue(config.isNat64DetectionEnabled())
assertTrue(config.isProvisioningNotificationEnabled())
}
} }
} }