Consider VPN always to be a supported type.

Change-Id I02eb5f22737720095f646f8db5c87fd66da129d6 adds VPN as a
supported network type to all device configurations directly in
software, independent of any external per-device configuration.

Reflect this expectation in the test.

Bug: 18439110
Bug: 18668362
Change-Id: I7fca77e564219c96e8a78372d4885c7b7f012a48
This commit is contained in:
Erik Kline
2014-12-10 20:22:47 +09:00
parent 5d5cd1f27d
commit 18fc2cd3c4

View File

@@ -197,7 +197,11 @@ public class ConnectivityManagerTest extends AndroidTestCase {
}
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