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

Commit bfe9b8a9 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I2b11393ca658db069262c8a20ccfdd12116b336b
parents 1796c893 e07b665e

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;