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

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

Browse Source 
* commit '77b855a1a832eda78888a2b04e23722c9ca093ab':
  Consider VPN always to be a supported type.
This commit is contained in:
Erik Kline
2015-01-08 02:14:59 +00:00
committed by Android Git Automerger
parent 8ddaa5e861 77b855a1a8
commit 13014fc7f8
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