Merge "Fix an issue in NPMS blockedReasons computation logic." into sc-v2-dev am: 32d70b6ef1

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

Change-Id: I4d4aa7678679c07c844c1aa7a1231b186991a6bf
This commit is contained in:
Sudheer Shanka
2021-10-15 19:09:21 +00:00
committed by Automerger Merge Worker

View File

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