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

Commit 85e4b054 authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban Committed by android-build-merger
Browse files

Merge "Only reset global restriction owner on DO->PO for the right user" into... 

Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am: 2002061f
am: 6b9371ce

* commit '6b9371ce':
  Only reset global restriction owner on DO->PO for the right user

Change-Id: I9c6c50902c4712da1ff114f75bd0f92c505bc4eb
parents 8bb0a30d 6b9371ce

services/core/java/com/android/server/pm/UserManagerService.java

+7 −3
Original line number Diff line number Diff line
@@ -1014,10 +1014,14 @@ public class UserManagerService extends IUserManager.Stub { 
                // in getUserRestrictionSource on who set local policies.

                mGlobalRestrictionOwnerUserId = userId;

            } else {

                // When profile owner sets restrictions it passes null global bundle and we reset 

                // global restriction owner userId.

                if (mGlobalRestrictionOwnerUserId == userId) {

                    // When profile owner sets restrictions it passes null global bundle and we

                    // reset global restriction owner userId.

                    // This means this user used to have DO, but now the DO is gone and the user

                    // instead has PO.

                    mGlobalRestrictionOwnerUserId = UserHandle.USER_NULL;

                }

            }

            {

                // Update local.

                final Bundle prev = mDevicePolicyLocalUserRestrictions.get(userId);