Merge "Consider VPN always to be a supported type." into lmp-mr1-dev
This commit is contained in:
@@ -197,7 +197,11 @@ public class ConnectivityManagerTest extends AndroidTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean isSupported(int networkType) {
|
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
|
// true if only the system can turn it on
|
||||||
|
|||||||
Reference in New Issue
Block a user