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

Author: jsharkey

core/java/android/os/INetworkManagementService.aidl

@@ -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

@@ -1451,7 +1451,7 @@ public boolean isFirewallEnabled() {
     }
 
     @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 void setInterfaceFirewallRule(String iface, boolean allow) {
     }
 
     @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 void setEgressSourceFirewallRule(String addr, boolean allow) {
     }
 
     @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 void setEgressDestFirewallRule(String addr, int port, boolean allow) {
     }
 
     @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;