am 0bc60661: am 67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-dev

* commit '0bc606614ab4c7ec20b6696e0a6bba4f46568925':
  Added missing check for MANAGE_USERS
This commit is contained in:
Fyodor Kupolov
2015-07-28 00:08:18 +00:00
committed by Android Git Automerger

View File

@@ -529,6 +529,7 @@ public class UserManagerService extends IUserManager.Stub {
@Override
public void setUserRestriction(String key, boolean value, int userId) {
checkManageUsersPermission("setUserRestriction");
synchronized (mPackagesLock) {
if (!SYSTEM_CONTROLLED_RESTRICTIONS.contains(key)) {
Bundle restrictions = getUserRestrictions(userId);