Merge "Fix the case where restricted mode allowed reasons are ignored" into sc-v2-dev

2021-12-14 23:59:01 +00:00
parent 1a789dc532 8ec56b2f84
commit ff733363f6
1 changed files with 2 additions and 0 deletions
--- 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 + ")"