commit 873cb0ef24be9bd5140c48ade6a12b0491060d38
author Chiachang Wang <chiachangwang@google.com> Thu Apr 15 11:26:41 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 15 11:26:41 2021 +0000
tree d91a2bf57cfa6b825e90ceb390103b862e4d0b56
parent 1c8ddf038d284f2e02950239a6bdf3e091eb9082
parent 52a55928a81eaa134978f5d9ee41d092e1da6970

Merge "Remove hidden method link in public addRoute API"

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

diff --git a/tests/net/common/java/android/net/NetworkAgentConfigTest.kt b/tests/net/common/java/android/net/NetworkAgentConfigTest.kt
index 454d5b5..2b45b3d 100644
--- a/tests/net/common/java/android/net/NetworkAgentConfigTest.kt
+++ b/tests/net/common/java/android/net/NetworkAgentConfigTest.kt
@@ -44,6 +44,9 @@
             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 @@
             if (isAtLeastS()) {
                 setNat64DetectionEnabled(false)
                 setProvisioningNotificationEnabled(false)
+                setBypassableVpn(true)
             }
         }.build()
 
@@ -78,6 +82,7 @@
         if (isAtLeastS()) {
             assertFalse(config.isNat64DetectionEnabled())
             assertFalse(config.isProvisioningNotificationEnabled())
+            assertTrue(config.isBypassableVpn())
         } else {
             assertTrue(config.isNat64DetectionEnabled())
             assertTrue(config.isProvisioningNotificationEnabled())