Merge "Consider VPN always to be a supported type." into lmp-mr1-dev
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index d79ecdd..15d368f 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -197,7 +197,11 @@
}
private boolean isSupported(int networkType) {
- return mNetworks.containsKey(networkType);
+ // Change-Id I02eb5f22737720095f646f8db5c87fd66da129d6 added VPN support
+ // to all devices directly in software, independent of any external
+ // configuration.
+ return mNetworks.containsKey(networkType) ||
+ (networkType == ConnectivityManager.TYPE_VPN);
}
// true if only the system can turn it on