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

Commit 8a5536d5 authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban
Browse files

Only reset global restriction owner on DO->PO for the right user

Bug:28972648
Change-Id: I4ef727205bbd8ec319672480bac7b519b33d2a58
parent 7730e57d
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -1009,10 +1009,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);