diff options
| author | 2020-08-14 18:37:05 +0000 | |
|---|---|---|
| committer | 2020-08-14 18:37:05 +0000 | |
| commit | eecca5adf0a245d60bb9b2a8681fa370c8de2dce (patch) | |
| tree | 0cb59a836fe586165557a4ab6a7a09fd12f9eb7e | |
| parent | dbf877733003051eeeb94a6ef65afd525cf34d90 (diff) | |
| parent | 1106a7e692cb91c739a3a772dae254881c0a560f (diff) | |
Merge "Fix a minor typo." am: ffd7fdeba1 am: a6fa6fd808 am: 1106a7e692
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399634
Change-Id: I44eec10939863f6e15c907427d4c9acba0a43b28
| -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); |