diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-07-27 23:56:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-27 23:56:29 +0000 |
| commit | 0bc606614ab4c7ec20b6696e0a6bba4f46568925 (patch) | |
| tree | 6ef86d5b62f01470b0a76264866abed885c8deb5 | |
| parent | 9c9c0eb88533dcaae45c128c076660e08e0746d2 (diff) | |
| parent | 67a32c499177d41e48c3ac5a803f883fd97acf37 (diff) | |
| download | frameworks_base-0bc606614ab4c7ec20b6696e0a6bba4f46568925.zip frameworks_base-0bc606614ab4c7ec20b6696e0a6bba4f46568925.tar.gz frameworks_base-0bc606614ab4c7ec20b6696e0a6bba4f46568925.tar.bz2 | |
am 67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-dev
* commit '67a32c499177d41e48c3ac5a803f883fd97acf37':
Added missing check for MANAGE_USERS
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 8ca10d3..19c5f0f 100644 --- 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); |