From c60b36d705bd6d0943f9fd0efbf7818ba1599ae9 Mon Sep 17 00:00:00 2001 From: markchien Date: Tue, 22 Mar 2022 17:30:04 +0800 Subject: [PATCH] Rename updateFirewallRule to setUidFirewallRule Bug: 218494748 Test: TH Change-Id: I0b7427521479271b34aed307f17a6e2225fb3076 --- .../com/android/server/NetworkManagementService.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index 1a39ffa393b37..73d9cc759b109 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) {