Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e07b665e authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Gerrit Code Review
Browse files

Merge "Fix the case where restricted mode allowed reasons are ignored"

parents 014af402 0b4cafda

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+2 −0
Original line number Diff line number Diff line
@@ -4759,6 +4759,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;