diff options
| author | 2020-08-14 17:38:21 +0000 | |
|---|---|---|
| committer | 2020-08-14 17:38:21 +0000 | |
| commit | a6fa6fd8088af8e53b9fb1d4017889fc82d35102 (patch) | |
| tree | e5bd4c0ac98f187825b777b60b97c41f965c0d59 | |
| parent | 8df35b81ca15dd7649e2e1870411e5155014fd1a (diff) | |
| parent | ffd7fdeba1ee017d8f177edf6aeb4d5f8cd7be80 (diff) | |
Merge "Fix a minor typo." am: ffd7fdeba1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399634
Change-Id: I4de0e16c3f4ea2a7423b5dfee42da41a3da52e43
| -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 0b01d9ed2a17..1b5a641edf52 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -4322,7 +4322,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); |