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

Merge "Fix the case where restricted mode allowed reasons are ignored" am: e07b665eec am: bfe9b8a9f3 am: 239e0ec234 am: d0ea504501

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

Change-Id: I950022906886f40a1fb830cc904570ac774254de
This commit is contained in:
Sudheer Shanka
2021-11-30 19:06:37 +00:00
committed by Automerger Merge Worker
parent cb646e9d65 d0ea504501
commit 129f4b3d2e
1 changed files with 2 additions and 0 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

@@ -4739,6 +4739,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
? ALLOWED_REASON_POWER_SAVE_ALLOWLIST : 0);
newAllowedReasons |= (isWhitelistedFromPowerSaveExceptIdleUL(uid)
? ALLOWED_REASON_POWER_SAVE_EXCEPT_IDLE_ALLOWLIST : 0);
newAllowedReasons |= (uidBlockedState.allowedReasons
& ALLOWED_REASON_RESTRICTED_MODE_PERMISSIONS);
uidBlockedState.blockedReasons = (uidBlockedState.blockedReasons
& BLOCKED_METERED_REASON_MASK) | newBlockedReasons;