Merge \"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\" into nyc-dev

am: 159c13801b Change-Id: Ic4d94327a21f2a8b8ae175e057039eafb9c2d698
2016-06-15 01:12:11 +00:00
parent f93ef9d4bc 159c13801b
commit 5df969f778
1 changed files with 1 additions and 1 deletions
--- 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));
        }