diff options
| author | 2012-08-24 11:46:27 -0700 | |
|---|---|---|
| committer | 2012-08-24 11:46:27 -0700 | |
| commit | 1552586283f329253edc4786a6cf40c5bb69ea36 (patch) | |
| tree | 18508291938dcee1535d179b4e7cf8556e45b062 /services/java/com | |
| parent | 34f863125865664af058ab4dff44ebec570e2234 (diff) | |
| parent | 2c0929850ae495d54efb91a68e4bbd29a2e0ec95 (diff) | |
Merge "Clean up firewall interface method names." into jb-mr1-dev
Diffstat (limited to 'services/java/com')
| -rw-r--r-- | services/java/com/android/server/NetworkManagementService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java index 722e1e03d156..fbd45a042d53 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; |