diff options
author | Chad Brubaker <cbrubaker@google.com> | 2013-07-15 16:34:04 -0700 |
---|---|---|
committer | Chad Brubaker <cbrubaker@google.com> | 2013-07-19 15:57:05 -0700 |
commit | f336d722c773855402d91a227fc290eafca23335 (patch) | |
tree | a8c479c48dd5878cab8c2990eef1fefad5c3f4bd /core/java/android/net | |
parent | a5bc070e9e7c802b32f0230c670838536a1612f4 (diff) | |
download | frameworks_base-f336d722c773855402d91a227fc290eafca23335.zip frameworks_base-f336d722c773855402d91a227fc290eafca23335.tar.gz frameworks_base-f336d722c773855402d91a227fc290eafca23335.tar.bz2 |
Fix supplimentary network connections with VPNs
Enables the use of supplimentary mobile networks like MMS, and HIPRI
while VPNs are running.
Change-Id: I313f57a905b4e16bd4322c68687cbff1cfbe9d3e
Diffstat (limited to 'core/java/android/net')
-rw-r--r-- | core/java/android/net/ConnectivityManager.java | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index f920874..8bbe6c8 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -480,6 +480,22 @@ public class ConnectivityManager { } /** + * Checks if the given network type should be exempt from VPN routing rules + * + * @hide + */ + public static boolean isNetworkTypeExempt(int networkType) { + switch (networkType) { + case TYPE_MOBILE_MMS: + case TYPE_MOBILE_SUPL: + case TYPE_MOBILE_HIPRI: + return true; + default: + return false; + } + } + + /** * Specifies the preferred network type. When the device has more * than one type available the preferred network type will be used. * Note that this made sense when we only had 2 network types, |