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

Commit 4f4d42e3 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Fix a minor typo." am: ffd7fdeb am: a6fa6fd8 am: 1106a7e6 am: eecca5ad 

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

Change-Id: Ia03503f0ee1e3671ea090e08f29a2294eae692fe
parents d1721e4d eecca5ad

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

+1 −1
Original line number Diff line number Diff line
@@ -4367,7 +4367,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                // Flip state because app was explicitly added or removed to denylist.

                setMeteredNetworkDenylist(uid, (isDenylisted || isRestrictedByAdmin));

                if (hasRule(oldRule, RULE_REJECT_METERED) && isAllowlisted) {

                    // Since dneylist prevails over allowlist, we need to handle the special case

                    // Since denylist prevails over allowlist, we need to handle the special case

                    // where app is allowlisted and denylisted at the same time (although such

                    // scenario should be blocked by the UI), then denylist is removed.

                    setMeteredNetworkAllowlist(uid, isAllowlisted);