diff options
| author | 2020-08-14 18:53:55 +0000 | |
|---|---|---|
| committer | 2020-08-14 18:53:55 +0000 | |
| commit | 4f4d42e30910df565bd6c33acfbdf4e34af3282b (patch) | |
| tree | e0106079f0965a414d42d3691b7de16c4555d3dc | |
| parent | d1721e4d042b1264f39390b4eaa054338b729d1f (diff) | |
| parent | eecca5adf0a245d60bb9b2a8681fa370c8de2dce (diff) | |
Merge "Fix a minor typo." am: ffd7fdeba1 am: a6fa6fd808 am: 1106a7e692 am: eecca5adf0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399634
Change-Id: Ia03503f0ee1e3671ea090e08f29a2294eae692fe
| -rw-r--r-- | services/core/java/com/android/server/net/NetworkPolicyManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 295143e76235..29ee8eb13564 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -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); |