Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 6b9371ceef

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

Change-Id: I9c6c50902c4712da1ff114f75bd0f92c505bc4eb
This commit is contained in:
Zoltan Szatmary-Ban
2016-06-02 16:50:40 +00:00
committed by android-build-merger
parent 8bb0a30d9c 6b9371ceef
commit 85e4b05461
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -1014,9 +1014,13 @@ 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.
mGlobalRestrictionOwnerUserId = UserHandle.USER_NULL;
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.