Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df54fe93 authored by Robert Horvath's avatar Robert Horvath Committed by Automerger Merge Worker
Browse files

Merge "Annotate setUidFirewallRule with @GuardedBy" into tm-dev am: 739267c0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16944323

Change-Id: I3f4def410b655725c8b7c1620c5a8003b82b6ed4
parents 15c612fb 739267c0

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+10 −9
Original line number Original line Diff line number Diff line
@@ -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) {