From 2c0929850ae495d54efb91a68e4bbd29a2e0ec95 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Fri, 24 Aug 2012 11:44:40 -0700 Subject: [PATCH] Clean up firewall interface method names. Change-Id: I653f0a01af7c90fc96b201abb31ea8354b036e74 --- core/java/android/os/INetworkManagementService.aidl | 8 ++++---- .../java/com/android/server/NetworkManagementService.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index 2cac9f625bbb3..2179fa163e96a 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/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); } diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java index 722e1e03d1566..fbd45a042d539 100644 --- a/services/java/com/android/server/NetworkManagementService.java +++ b/services/java/com/android/server/NetworkManagementService.java @@ -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;