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

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

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

Change-Id: Ia433edec97f3a02c95dcf89f9f8ae80244063a89
This commit is contained in:
Treehugger Robot
2021-04-15 10:01:20 +00:00
committed by Automerger Merge Worker
parent 7771a62ab1 df2a314d6c
commit 7f7769b82e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,9 @@ class NetworkAgentConfigTest {
setSubscriberId("MySubId") setSubscriberId("MySubId")
setPartialConnectivityAcceptable(false) setPartialConnectivityAcceptable(false)
setUnvalidatedConnectivityAcceptable(true) setUnvalidatedConnectivityAcceptable(true)
if (isAtLeastS()) {
setBypassableVpn(true)
}
}.build() }.build()
if (isAtLeastS()) { if (isAtLeastS()) {
// From S, the config will have 12 items // From S, the config will have 12 items
@@ -66,6 +69,7 @@ class NetworkAgentConfigTest {
if (isAtLeastS()) { if (isAtLeastS()) {
setNat64DetectionEnabled(false) setNat64DetectionEnabled(false)
setProvisioningNotificationEnabled(false) setProvisioningNotificationEnabled(false)
setBypassableVpn(true)
} }
}.build() }.build()
@@ -78,6 +82,7 @@ class NetworkAgentConfigTest {
if (isAtLeastS()) { if (isAtLeastS()) {
assertFalse(config.isNat64DetectionEnabled()) assertFalse(config.isNat64DetectionEnabled())
assertFalse(config.isProvisioningNotificationEnabled()) assertFalse(config.isProvisioningNotificationEnabled())
assertTrue(config.isBypassableVpn())
} else { } else {
assertTrue(config.isNat64DetectionEnabled()) assertTrue(config.isNat64DetectionEnabled())
assertTrue(config.isProvisioningNotificationEnabled()) assertTrue(config.isProvisioningNotificationEnabled())