summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hai Zhang <zhanghai@google.com> 2019-01-14 16:51:30 -0800
committer Hai Zhang <zhanghai@google.com> 2019-01-14 16:51:30 -0800
commitd74fc2d3e2a86b09744db135ce1bc65f21fbb2db (patch)
tree24e0e1d5067e85a2a8ef36272053be88a3ef0ab7
parent94ae766a983bdaf5f31493f7aa604b4735725830 (diff)
Don't try to migrate role when getting its holders.
Role migration is handled in performInitialGrantsIfNecessary() for specific roles, so it should not happen in getRoleHoldersInternal(). Bug: 110557011 Test: build Change-Id: I4a0cb24d3014aebbfd413b0a23cd77f10b4ec8c4
-rw-r--r--services/core/java/com/android/server/role/RoleManagerService.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/role/RoleManagerService.java b/services/core/java/com/android/server/role/RoleManagerService.java
index b4883371b468..c0ec3672c665 100644
--- a/services/core/java/com/android/server/role/RoleManagerService.java
+++ b/services/core/java/com/android/server/role/RoleManagerService.java
@@ -406,7 +406,6 @@ public class RoleManagerService extends SystemService implements RoleUserState.C
@Nullable
private ArraySet<String> getRoleHoldersInternal(@NonNull String roleName,
@UserIdInt int userId) {
- migrateRoleIfNecessary(roleName, userId);
RoleUserState userState = getOrCreateUserState(userId);
return userState.getRoleHolders(roleName);
}