| commit | dc89fd5252280dada99a0342f1a2eb2fe31e988f | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Fri Aug 14 19:11:46 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 14 19:11:46 2020 +0000 |
| tree | ecbc1904f262414e6668b3033cdb840eefe83552 | |
| parent | 4e57fc3dfed1776d9e62cea0b3faae1d71b2e5ea [diff] | |
| parent | 4f4d42e30910df565bd6c33acfbdf4e34af3282b [diff] |
Merge "Fix a minor typo." am: ffd7fdeba1 am: a6fa6fd808 am: 1106a7e692 am: eecca5adf0 am: 4f4d42e309 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399634 Change-Id: I4962b5c5b6413da5f7d47b8e430526b9209622b5
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 295143e..29ee8eb 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 @@ // 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);