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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-02 15:59:23 +00:00
committed by Android (Google) Code Review
parent 8e2a2fa98c 8a5536d53e
commit 2002061f34
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

@@ -1009,9 +1009,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.