summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2016-06-15 01:02:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-06-15 01:02:34 +0000
commit159c13801bb58714c463a7a170517776d590e3e8 (patch)
tree233eddb17655fc221fdea84210ba967deb0501b7
parentea1f3cb5c3664f80c1218ab54783c2364ce0de95 (diff)
parentaccaa08c98d5c4dd012149e452d6fb19ce0c134b (diff)
Merge "Allow apps with CREATE_USERS permission to call UM.getUserInfo." into nyc-dev
-rw-r--r--services/core/java/com/android/server/pm/UserManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index dd34ebcf690e..a8cf110655f8 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -798,7 +798,7 @@ public class UserManagerService extends IUserManager.Stub {
@Override
public UserInfo getUserInfo(int userId) {
- checkManageUsersPermission("query user");
+ checkManageOrCreateUsersPermission("query user");
synchronized (mUsersLock) {
return userWithName(getUserInfoLU(userId));
}