commit 2c0929850ae495d54efb91a68e4bbd29a2e0ec95
author Jeff Sharkey <jsharkey@android.com> Fri Aug 24 11:44:40 2012 -0700
committer Jeff Sharkey <jsharkey@android.com> Fri Aug 24 11:44:40 2012 -0700
tree 4d513be85de3034f72962a3018303b92b0a7cf07
parent 82f8521d386f3109147c477d04e5e90e5c715fa0

Clean up firewall interface method names.

Change-Id: I653f0a01af7c90fc96b201abb31ea8354b036e74

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

diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java
index 722e1e0..fbd45a0 100644
--- a/services/java/com/android/server/NetworkManagementService.java
+++ b/services/java/com/android/server/NetworkManagementService.java
@@ -1451,7 +1451,7 @@
     }
 
     @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 @@
     }
 
     @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 @@
     }
 
     @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 @@
     }
 
     @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;