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

* commit '67a32c499177d41e48c3ac5a803f883fd97acf37': Added missing check for MANAGE_USERS
2015-07-28 00:35:31 +00:00
parent 199c0b3f0e 67a32c4991
commit cb3ae68e14
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -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);