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

Merge "Rename updateFirewallRule to setUidFirewallRule" am: 39ae5bac21 am: fa604b4fbe

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045073

Change-Id: I965aff9d86686aa5588c7f59d77ba9d680cf1332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-03-29 04:22:38 +00:00
committed by Automerger Merge Worker
parent 500742b6ec fa604b4fbe
commit cbfdb8fd4b
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -1528,7 +1528,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
if (updateFirewallUidRuleLocked(chain, uid, rule)) { if (updateFirewallUidRuleLocked(chain, uid, rule)) {
final ConnectivityManager cm = mContext.getSystemService(ConnectivityManager.class); final ConnectivityManager cm = mContext.getSystemService(ConnectivityManager.class);
try { try {
cm.updateFirewallRule(chain, uid, isFirewallRuleAllow(chain, rule)); cm.setUidFirewallRule(chain, uid, rule);
} catch (RuntimeException e) { } catch (RuntimeException e) {
throw new IllegalStateException(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() { private void enforceSystemUid() {
final int uid = mDeps.getCallingUid(); final int uid = mDeps.getCallingUid();
if (uid != Process.SYSTEM_UID) { if (uid != Process.SYSTEM_UID) {