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

* commit '67a32c499177d41e48c3ac5a803f883fd97acf37':
  Added missing check for MANAGE_USERS
This commit is contained in:
Fyodor Kupolov
2015-07-27 23:56:29 +00:00
committed by Android Git Automerger

View File

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