commit 98dac2f1d9ff0831e1b23990194850c72595270e
author markchien <markchien@google.com> Tue Mar 22 17:30:04 2022 +0800
committer markchien <markchien@google.com> Fri Mar 25 21:15:37 2022 +0800
tree 7dab831997c7cacf5ed0a83daad7f7dcb29c363a
parent dd1a3bae159206ec183cf2776f95ea4c6313b1be

Rename updateFirewallRule to setUidFirewallRule

Bug: 218494748
Test: TH
Change-Id: I0b7427521479271b34aed307f17a6e2225fb3076
Merged-In: I0b7427521479271b34aed307f17a6e2225fb3076

services/core/java/com/android/server/NetworkManagementService.java

diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index 1a39ffa..73d9cc7 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -1528,7 +1528,7 @@
         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 @@
         }
     }
 
-    // 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) {