Commit e2b87c4b authored Jun 15, 2016 by Sudheer Shanka Committed by android-build-merger Jun 15, 2016

Merge \\\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\\"...

Merge \\\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\\" into nyc-dev am: 159c1380 am: 1f096663
am: b8d43da6

Change-Id: I63872a15b30d5fc7fede187019d01aa26cf3c68f

parents e1de04eb b8d43da6

services/core/java/com/android/server/pm/UserManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -803,7 +803,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));
		}