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 /services/java/com/android/server/NetworkManagementService.java | |
| 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 'services/java/com/android/server/NetworkManagementService.java')
| -rw-r--r-- | services/java/com/android/server/NetworkManagementService.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java index c3a43bb..988b1f2 100644 --- a/services/java/com/android/server/NetworkManagementService.java +++ b/services/java/com/android/server/NetworkManagementService.java @@ -1473,6 +1473,26 @@ public class NetworkManagementService extends INetworkManagementService.Stub } @Override + public void setHostExemption(LinkAddress host) { + mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); + try { + mConnector.execute("interface", "fwmark", "exempt", "add", host); + } catch (NativeDaemonConnectorException e) { + throw e.rethrowAsParcelableException(); + } + } + + @Override + public void clearHostExemption(LinkAddress host) { + mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); + try { + mConnector.execute("interface", "fwmark", "exempt", "remove", host); + } catch (NativeDaemonConnectorException e) { + throw e.rethrowAsParcelableException(); + } + } + + @Override public void setDnsInterfaceForUidRange(String iface, int uid_start, int uid_end) { mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); try { |