commit 2dc15b02b24a19225404c317c5c2c3e7d13b1fb9
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 15 07:03:31 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 15 07:03:31 2020 +0000
tree d0429e70bc3bf5b5937e2dc9d247b216a20dc330
parent 099b0b8700e1f38f4fcb179c1f76a7555599a266
parent 1894a799643f089cda361219af02b93e9c5c0649

Merge "Address nit from aosp/1301317" am: 1894a79964

Change-Id: I2443c5da4b69bce693a39e894c41db5b25b6cf03

tests/net/java/com/android/server/ConnectivityServiceTest.java

diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index 5e2ef04..e66e264 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -5494,6 +5494,8 @@
         assertFalse(nc.hasTransport(TRANSPORT_WIFI));
         // For safety reasons a VPN without underlying networks is considered metered.
         assertFalse(nc.hasCapability(NET_CAPABILITY_NOT_METERED));
+        // A VPN without underlying networks is not suspended.
+        assertTrue(nc.hasCapability(NET_CAPABILITY_NOT_SUSPENDED));
 
         // Connect cell and use it as an underlying network.
         mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR);