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

Merge "Consider VPN always to be a supported type." into lmp-mr1-dev

Browse Source
This commit is contained in:
Erik Kline
2015-01-08 01:55:43 +00:00
committed by Android (Google) Code Review
parent 83375d2bd2 18fc2cd3c4
commit 77b855a1a8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
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