diff options
author | Sreeram Ramachandran <sreeram@google.com> | 2014-07-11 15:47:13 -0700 |
---|---|---|
committer | Sreeram Ramachandran <sreeram@google.com> | 2014-07-11 15:47:51 -0700 |
commit | 31ab41726b84c31a6aa45c929aad4ad04d32a992 (patch) | |
tree | 51cd0e3304de33168856531f8cb240392b600758 | |
parent | 1710e0318db5db833974e390eb4bde54ab2f3c62 (diff) | |
download | frameworks_base-31ab41726b84c31a6aa45c929aad4ad04d32a992.zip frameworks_base-31ab41726b84c31a6aa45c929aad4ad04d32a992.tar.gz frameworks_base-31ab41726b84c31a6aa45c929aad4ad04d32a992.tar.bz2 |
Delete unused APIs in NetworkManagementService.
Change-Id: Idc6c0ac0d3a4149821fc7820b7f37d4209fc55d3
-rw-r--r-- | core/java/android/os/INetworkManagementService.aidl | 15 | ||||
-rw-r--r-- | services/core/java/com/android/server/NetworkManagementService.java | 37 |
2 files changed, 0 insertions, 52 deletions
diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index d997e44..077d94c 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -341,21 +341,6 @@ interface INetworkManagementService int getMarkForUid(int uid); /** - * Get the SO_MARK associated with protecting packets from VPN routing rules - */ - int getMarkForProtect(); - - /** - * Route all traffic in {@code route} to {@code iface} setup for marked forwarding - */ - void setMarkedForwardingRoute(String iface, in RouteInfo route); - - /** - * Clear routes set by {@link setMarkedForwardingRoute} - */ - void clearMarkedForwardingRoute(String iface, in RouteInfo route); - - /** * Exempts {@code host} from the routing set up by {@link setMarkedForwardingRoute} * All connects to {@code host} will use the global routing table */ diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index c9f40cf..c0862c0 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -1763,43 +1763,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub } @Override - public int getMarkForProtect() { - mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - final NativeDaemonEvent event; - try { - event = mConnector.execute("interface", "fwmark", "get", "protect"); - } catch (NativeDaemonConnectorException e) { - throw e.rethrowAsParcelableException(); - } - event.checkCode(GetMarkResult); - return Integer.parseInt(event.getMessage()); - } - - @Override - public void setMarkedForwardingRoute(String iface, RouteInfo route) { - mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - try { - LinkAddress dest = route.getDestinationLinkAddress(); - mConnector.execute("interface", "fwmark", "route", "add", iface, - dest.getAddress().getHostAddress(), dest.getPrefixLength()); - } catch (NativeDaemonConnectorException e) { - throw e.rethrowAsParcelableException(); - } - } - - @Override - public void clearMarkedForwardingRoute(String iface, RouteInfo route) { - mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - try { - LinkAddress dest = route.getDestinationLinkAddress(); - mConnector.execute("interface", "fwmark", "route", "remove", iface, - dest.getAddress().getHostAddress(), dest.getPrefixLength()); - } catch (NativeDaemonConnectorException e) { - throw e.rethrowAsParcelableException(); - } - } - - @Override public void setHostExemption(LinkAddress host) { mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); try { |