summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author markchien <markchien@google.com> 2022-03-22 17:30:04 +0800
committer markchien <markchien@google.com> 2022-03-23 01:24:19 +0800
commitc60b36d705bd6d0943f9fd0efbf7818ba1599ae9 (patch)
treee9c602adf77aa5d6db761cb832e2492db1214201
parentc5026d423650aa5588c27244279342e979bb2608 (diff)
Rename updateFirewallRule to setUidFirewallRule
Bug: 218494748 Test: TH Change-Id: I0b7427521479271b34aed307f17a6e2225fb3076
-rw-r--r--services/core/java/com/android/server/NetworkManagementService.java10
1 files changed, 1 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index 1a39ffa393b3..73d9cc759b10 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -1528,7 +1528,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
if (updateFirewallUidRuleLocked(chain, uid, rule)) {
final ConnectivityManager cm = mContext.getSystemService(ConnectivityManager.class);
try {
- cm.updateFirewallRule(chain, uid, isFirewallRuleAllow(chain, rule));
+ cm.setUidFirewallRule(chain, uid, rule);
} catch (RuntimeException e) {
throw new IllegalStateException(e);
}
@@ -1601,14 +1601,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
}
}
- // There are only two type of firewall rule: FIREWALL_RULE_ALLOW or FIREWALL_RULE_DENY.
- private boolean isFirewallRuleAllow(int chain, int rule) {
- if (rule == NetworkPolicyManager.FIREWALL_RULE_DEFAULT) {
- return getFirewallType(chain) == FIREWALL_DENYLIST;
- }
- return rule == INetd.FIREWALL_RULE_ALLOW;
- }
-
private void enforceSystemUid() {
final int uid = mDeps.getCallingUid();
if (uid != Process.SYSTEM_UID) {