Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53a12298 authored by Robin Lee's avatar Robin Lee Committed by Gerrit Code Review
Browse files

Merge "Remove unused network management RPCs"

parents c90fcbd6 f3b8a45f

core/java/android/os/INetworkManagementService.aidl

+0 −2
Original line number Diff line number Diff line
@@ -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);

services/core/java/com/android/server/NetworkManagementService.java

+0 −24
Original line number Diff line number Diff line
@@ -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;