diff options
| author | 2021-12-14 23:59:01 +0000 | |
|---|---|---|
| committer | 2021-12-14 23:59:01 +0000 | |
| commit | ff733363f6884f8ae52922ca316b4fe7a831f827 (patch) | |
| tree | 5166bd5973d63d71b156e3676c36a190c5e4247e | |
| parent | 1a789dc532d23917cafb4776320ceff97376b36d (diff) | |
| parent | 8ec56b2f8411da5b2be7e67a2cb2672d60280388 (diff) | |
Merge "Fix the case where restricted mode allowed reasons are ignored" into sc-v2-dev
| -rw-r--r-- | services/core/java/com/android/server/net/NetworkPolicyManagerService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 20687c6764db..cfefffcdd2e8 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -4899,6 +4899,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); if (LOGV) { Log.v(TAG, "updateRulesForPowerRestrictionsUL(" + uid + ")" |