Merge "Fix an issue in NPMS blockedReasons computation logic." am: 37e891fce1

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

Change-Id: If0d415a257b36f1d496754fb7da019aa4f8f2bca
This commit is contained in:
Sudheer Shanka
2021-10-15 23:09:57 +00:00
committed by Automerger Merge Worker

View File

@@ -4073,7 +4073,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
if (hasRestrictedModeAccess(uid)) { if (hasRestrictedModeAccess(uid)) {
uidBlockedState.allowedReasons |= ALLOWED_REASON_RESTRICTED_MODE_PERMISSIONS; uidBlockedState.allowedReasons |= ALLOWED_REASON_RESTRICTED_MODE_PERMISSIONS;
} else { } else {
uidBlockedState.allowedReasons &= ALLOWED_REASON_RESTRICTED_MODE_PERMISSIONS; uidBlockedState.allowedReasons &= ~ALLOWED_REASON_RESTRICTED_MODE_PERMISSIONS;
} }
uidBlockedState.updateEffectiveBlockedReasons(); uidBlockedState.updateEffectiveBlockedReasons();
if (oldEffectiveBlockedReasons != uidBlockedState.effectiveBlockedReasons) { if (oldEffectiveBlockedReasons != uidBlockedState.effectiveBlockedReasons) {