From f3b8a45f86f24057ffb1469c619846cecf314718 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Fri, 10 Mar 2017 16:28:59 +0000 Subject: [PATCH] Remove unused network management RPCs These were previously used for legacy VPN network lockdown, but they aren't any more, so we don't need them any more. Test: make -j30 full # still builds Bug: 33159037 Change-Id: I03ab248a52dd7aed29fc049622aeb4dbca1e86ae --- .../android/os/INetworkManagementService.aidl | 2 -- .../server/NetworkManagementService.java | 24 ------------------- 2 files changed, 26 deletions(-) diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index dbe2f6d3283d8..c34de1551ebf9 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -315,8 +315,6 @@ interface INetworkManagementService void setFirewallEnabled(boolean enabled); boolean isFirewallEnabled(); void setFirewallInterfaceRule(String iface, boolean allow); - void setFirewallEgressSourceRule(String addr, boolean allow); - void setFirewallEgressDestRule(String addr, int port, boolean allow); void setFirewallUidRule(int chain, int uid, int rule); void setFirewallUidRules(int chain, in int[] uids, in int[] rules); void setFirewallChainEnabled(int chain, boolean enable); diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index f4e11c792ed7e..7e1a1ca60826e 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -1896,30 +1896,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub } } - @Override - public void setFirewallEgressSourceRule(String addr, boolean allow) { - enforceSystemUid(); - Preconditions.checkState(mFirewallEnabled); - final String rule = allow ? "allow" : "deny"; - try { - mConnector.execute("firewall", "set_egress_source_rule", addr, rule); - } catch (NativeDaemonConnectorException e) { - throw e.rethrowAsParcelableException(); - } - } - - @Override - public void setFirewallEgressDestRule(String addr, int port, boolean allow) { - enforceSystemUid(); - Preconditions.checkState(mFirewallEnabled); - final String rule = allow ? "allow" : "deny"; - try { - mConnector.execute("firewall", "set_egress_dest_rule", addr, port, rule); - } catch (NativeDaemonConnectorException e) { - throw e.rethrowAsParcelableException(); - } - } - private void closeSocketsForFirewallChainLocked(int chain, String chainName) { // UID ranges to close sockets on. UidRange[] ranges;