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

Annotate setUidFirewallRule with @GuardedBy

Browse Source 
This method is only called with the lock held.
Annotating it helps ErrorProne verify calls to other methods that
require the lock to be held are okay.

Test: Build
Bug: 220270435
Change-Id: I1f6c3c9e339935c06b3edd5436b2b1a7922a67ed
This commit is contained in:
Robert Horvath
2022-02-10 16:48:08 +01:00
parent 464451edf3
commit 22fc59ad6f
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -4157,7 +4157,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
if (mRestrictedNetworkingMode) { if (mRestrictedNetworkingMode) {
// Note: setUidFirewallRule also updates mUidFirewallRestrictedModeRules. // Note: setUidFirewallRule also updates mUidFirewallRestrictedModeRules.
// In this case, default firewall rules can also be added. // In this case, default firewall rules can also be added.
setUidFirewallRule(FIREWALL_CHAIN_RESTRICTED, uid, setUidFirewallRuleUL(FIREWALL_CHAIN_RESTRICTED, uid,
getRestrictedModeFirewallRule(uidBlockedState)); getRestrictedModeFirewallRule(uidBlockedState));
} }
} }
@@ -4321,10 +4321,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
&& (uidBlockedState.effectiveBlockedReasons & BLOCKED_REASON_LOW_POWER_STANDBY) && (uidBlockedState.effectiveBlockedReasons & BLOCKED_REASON_LOW_POWER_STANDBY)
== 0) { == 0) {
mUidFirewallLowPowerStandbyModeRules.put(uid, FIREWALL_RULE_ALLOW); mUidFirewallLowPowerStandbyModeRules.put(uid, FIREWALL_RULE_ALLOW);
setUidFirewallRule(FIREWALL_CHAIN_LOW_POWER_STANDBY, uid, FIREWALL_RULE_ALLOW); setUidFirewallRuleUL(FIREWALL_CHAIN_LOW_POWER_STANDBY, uid, FIREWALL_RULE_ALLOW);
} else { } else {
mUidFirewallLowPowerStandbyModeRules.delete(uid); mUidFirewallLowPowerStandbyModeRules.delete(uid);
setUidFirewallRule(FIREWALL_CHAIN_LOW_POWER_STANDBY, uid, FIREWALL_RULE_DEFAULT); setUidFirewallRuleUL(FIREWALL_CHAIN_LOW_POWER_STANDBY, uid, FIREWALL_RULE_DEFAULT);
} }
} }
@@ -4373,9 +4373,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
final boolean isWhitelisted = isWhitelistedFromPowerSaveUL(uid, final boolean isWhitelisted = isWhitelistedFromPowerSaveUL(uid,
chain == FIREWALL_CHAIN_DOZABLE); chain == FIREWALL_CHAIN_DOZABLE);
if (isWhitelisted || isUidForegroundOnRestrictPowerUL(uid)) { if (isWhitelisted || isUidForegroundOnRestrictPowerUL(uid)) {
setUidFirewallRule(chain, uid, FIREWALL_RULE_ALLOW); setUidFirewallRuleUL(chain, uid, FIREWALL_RULE_ALLOW);
} else { } else {
setUidFirewallRule(chain, uid, FIREWALL_RULE_DEFAULT); setUidFirewallRuleUL(chain, uid, FIREWALL_RULE_DEFAULT);
} }
} }
} }
@@ -4421,10 +4421,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
int appId = UserHandle.getAppId(uid); int appId = UserHandle.getAppId(uid);
if (!mPowerSaveTempWhitelistAppIds.get(appId) && isUidIdle(uid) if (!mPowerSaveTempWhitelistAppIds.get(appId) && isUidIdle(uid)
&& !isUidForegroundOnRestrictPowerUL(uid)) { && !isUidForegroundOnRestrictPowerUL(uid)) {
setUidFirewallRule(FIREWALL_CHAIN_STANDBY, uid, FIREWALL_RULE_DENY); setUidFirewallRuleUL(FIREWALL_CHAIN_STANDBY, uid, FIREWALL_RULE_DENY);
if (LOGD) Log.d(TAG, "updateRuleForAppIdleUL DENY " + uid); if (LOGD) Log.d(TAG, "updateRuleForAppIdleUL DENY " + uid);
} else { } else {
setUidFirewallRule(FIREWALL_CHAIN_STANDBY, uid, FIREWALL_RULE_DEFAULT); setUidFirewallRuleUL(FIREWALL_CHAIN_STANDBY, uid, FIREWALL_RULE_DEFAULT);
if (LOGD) Log.d(TAG, "updateRuleForAppIdleUL " + uid + " to DEFAULT"); if (LOGD) Log.d(TAG, "updateRuleForAppIdleUL " + uid + " to DEFAULT");
} }
} finally { } finally {
@@ -5495,10 +5495,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
/** /**
* Add or remove a uid to the firewall denylist for all network ifaces. * Add or remove a uid to the firewall denylist for all network ifaces.
*/ */
private void setUidFirewallRule(int chain, int uid, int rule) { @GuardedBy("mUidRulesFirstLock")
private void setUidFirewallRuleUL(int chain, int uid, int rule) {
if (Trace.isTagEnabled(Trace.TRACE_TAG_NETWORK)) { if (Trace.isTagEnabled(Trace.TRACE_TAG_NETWORK)) {
Trace.traceBegin(Trace.TRACE_TAG_NETWORK, Trace.traceBegin(Trace.TRACE_TAG_NETWORK,
"setUidFirewallRule: " + chain + "/" + uid + "/" + rule); "setUidFirewallRuleUL: " + chain + "/" + uid + "/" + rule);
} }
try { try {
if (chain == FIREWALL_CHAIN_DOZABLE) { if (chain == FIREWALL_CHAIN_DOZABLE) {