diff options
| author | Geremy Condra <gcondra@google.com> | 2013-07-23 17:58:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-23 17:58:33 +0000 |
| commit | 5830e0752121c5565da184727888de6567b50e3a (patch) | |
| tree | b7b328c2648483675bbb6b55870f88ab9c214df0 /core/java/android/net | |
| parent | 1b6868cc4b8455e8660ba35ccdcc34abbaa43ffa (diff) | |
| parent | f336d722c773855402d91a227fc290eafca23335 (diff) | |
| download | frameworks_base-5830e0752121c5565da184727888de6567b50e3a.zip frameworks_base-5830e0752121c5565da184727888de6567b50e3a.tar.gz frameworks_base-5830e0752121c5565da184727888de6567b50e3a.tar.bz2 | |
Merge "Fix supplimentary network connections with VPNs"
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, |