From d91dd06591a761aa9e3eab519a23b40bf2b0dbcc Mon Sep 17 00:00:00 2001 From: bohu Date: Mon, 26 Sep 2016 16:20:07 -0700 Subject: [PATCH] Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell BUG: 34132936 BUG: 31648062 Change-Id: I9679c18c0e3611ebc9779408826f182ea8f1e88b (cherry picked from commit 57f47e8490b68678fd123cdc111d5073ec994382) (cherry picked from commit 12d23a13bb45cd4f83395f0f45f3382d7571effe) --- services/core/java/com/android/server/pm/UserManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index bed2d33bebfd..536d525da799 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -573,7 +573,7 @@ public class UserManagerService extends IUserManager.Stub { @Override public int[] getProfileIds(int userId, boolean enabledOnly) { if (userId != UserHandle.getCallingUserId()) { - checkManageUsersPermission("getting profiles related to user " + userId); + checkManageOrCreateUsersPermission("getting profiles related to user " + userId); } final long ident = Binder.clearCallingIdentity(); try { -- 2.11.0