Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Sharkey
2012-08-24 11:46:27 -07:00
committed by Android (Google) Code Review
parent 34f8631258 2c0929850a
commit 1552586283
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/os/INetworkManagementService.aidl
View File

@@ -365,8 +365,8 @@ interface INetworkManagementService
void setFirewallEnabled(boolean enabled); void setFirewallEnabled(boolean enabled);
boolean isFirewallEnabled(); boolean isFirewallEnabled();
void setInterfaceFirewallRule(String iface, boolean allow); void setFirewallInterfaceRule(String iface, boolean allow);
void setEgressSourceFirewallRule(String addr, boolean allow); void setFirewallEgressSourceRule(String addr, boolean allow);
void setEgressDestFirewallRule(String addr, int port, boolean allow); void setFirewallEgressDestRule(String addr, int port, boolean allow);
void setUidFirewallRule(int uid, boolean allow); void setFirewallUidRule(int uid, boolean allow);
} }

8
services/java/com/android/server/NetworkManagementService.java
View File

@@ -1451,7 +1451,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
} }
@Override @Override
public void setInterfaceFirewallRule(String iface, boolean allow) { public void setFirewallInterfaceRule(String iface, boolean allow) {
mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
Preconditions.checkState(mFirewallEnabled); Preconditions.checkState(mFirewallEnabled);
final String rule = allow ? ALLOW : DENY; final String rule = allow ? ALLOW : DENY;
@@ -1463,7 +1463,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
} }
@Override @Override
public void setEgressSourceFirewallRule(String addr, boolean allow) { public void setFirewallEgressSourceRule(String addr, boolean allow) {
mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
Preconditions.checkState(mFirewallEnabled); Preconditions.checkState(mFirewallEnabled);
final String rule = allow ? ALLOW : DENY; final String rule = allow ? ALLOW : DENY;
@@ -1475,7 +1475,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
} }
@Override @Override
public void setEgressDestFirewallRule(String addr, int port, boolean allow) { public void setFirewallEgressDestRule(String addr, int port, boolean allow) {
mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
Preconditions.checkState(mFirewallEnabled); Preconditions.checkState(mFirewallEnabled);
final String rule = allow ? ALLOW : DENY; final String rule = allow ? ALLOW : DENY;
@@ -1487,7 +1487,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
} }
@Override @Override
public void setUidFirewallRule(int uid, boolean allow) { public void setFirewallUidRule(int uid, boolean allow) {
mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
Preconditions.checkState(mFirewallEnabled); Preconditions.checkState(mFirewallEnabled);
final String rule = allow ? ALLOW : DENY; final String rule = allow ? ALLOW : DENY;