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

Commit 15525862 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Clean up firewall interface method names." into jb-mr1-dev

parents 34f86312 2c092985

core/java/android/os/INetworkManagementService.aidl

+4 −4
Original line number Diff line number Diff line
@@ -365,8 +365,8 @@ interface INetworkManagementService 


    void setFirewallEnabled(boolean enabled);

    boolean isFirewallEnabled();

    void setInterfaceFirewallRule(String iface, boolean allow);

    void setEgressSourceFirewallRule(String addr, boolean allow);

    void setEgressDestFirewallRule(String addr, int port, boolean allow);

    void setUidFirewallRule(int uid, boolean allow);

    void setFirewallInterfaceRule(String iface, boolean allow);

    void setFirewallEgressSourceRule(String addr, boolean allow);

    void setFirewallEgressDestRule(String addr, int port, boolean allow);

    void setFirewallUidRule(int uid, boolean allow);

}

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

+4 −4
Original line number Diff line number Diff line
@@ -1451,7 +1451,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    }



    @Override

    public void setInterfaceFirewallRule(String iface, boolean allow) {

    public void setFirewallInterfaceRule(String iface, boolean allow) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        Preconditions.checkState(mFirewallEnabled);

        final String rule = allow ? ALLOW : DENY;
@@ -1463,7 +1463,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    }



    @Override

    public void setEgressSourceFirewallRule(String addr, boolean allow) {

    public void setFirewallEgressSourceRule(String addr, boolean allow) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        Preconditions.checkState(mFirewallEnabled);

        final String rule = allow ? ALLOW : DENY;
@@ -1475,7 +1475,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    }



    @Override

    public void setEgressDestFirewallRule(String addr, int port, boolean allow) {

    public void setFirewallEgressDestRule(String addr, int port, boolean allow) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        Preconditions.checkState(mFirewallEnabled);

        final String rule = allow ? ALLOW : DENY;
@@ -1487,7 +1487,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    }



    @Override

    public void setUidFirewallRule(int uid, boolean allow) {

    public void setFirewallUidRule(int uid, boolean allow) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        Preconditions.checkState(mFirewallEnabled);

        final String rule = allow ? ALLOW : DENY;