summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author bohu <bohu@google.com> 2016-09-26 16:20:07 -0700
committer Sudheer Shanka <sudheersai@google.com> 2016-10-14 19:49:50 +0000
commit12d23a13bb45cd4f83395f0f45f3382d7571effe (patch)
tree034bb5f61c90aa42a0ec2d00c397927698f43efc
parent4aed7713c5aba9d32b4bd1c8f74acb804f500d58 (diff)
Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell
BUG: 31648062 Change-Id: I9679c18c0e3611ebc9779408826f182ea8f1e88b (cherry picked from commit 57f47e8490b68678fd123cdc111d5073ec994382)
-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 9f6e8c07abdc..efd6f46fe95e 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -592,7 +592,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 {