Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a minor typo." am: ffd7fdeba1 am: a6fa6fd808 am: 1106a7e692 am: eecca5adf0

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

Change-Id: Ia03503f0ee1e3671ea090e08f29a2294eae692fe
This commit is contained in:
Sudheer Shanka
2020-08-14 18:53:55 +00:00
committed by Automerger Merge Worker
parent d1721e4d04 eecca5adf0
commit 4f4d42e309
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -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);