From 01f6f18575f7986878d251a57abfeef40e4d5ff9 Mon Sep 17 00:00:00 2001 From: Richard MacGregor Date: Mon, 9 Dec 2024 10:17:53 -0800 Subject: Followup fixes for RoleManager test api Followup fixes for RoleManager get/setDefaultHoldersForTest and is/setRoleVisibleForTest LOW_COVERAGE_REASON=b/382484309 Relnote: N/A Flag: com.android.permission.flags.cross_user_role_enabled Bug: 381315745 Test: atest RoleManagerTest Test: atest RoleManagerMultiUserTest Change-Id: I19ddcd4a71682f89ccf32322833db3404f46c86f --- .../ReservedForTestingProfileGroupExclusivityRoleBehavior.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'PermissionController/role-controller/java') diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/ReservedForTestingProfileGroupExclusivityRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/ReservedForTestingProfileGroupExclusivityRoleBehavior.java index a9be00806..91b4e1531 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/behavior/ReservedForTestingProfileGroupExclusivityRoleBehavior.java +++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/ReservedForTestingProfileGroupExclusivityRoleBehavior.java @@ -37,8 +37,8 @@ public class ReservedForTestingProfileGroupExclusivityRoleBehavior implements Ro @NonNull Context context) { if (RoleFlags.isProfileGroupExclusivityAvailable()) { Context userContext = UserUtils.getUserContext(context, user); - RoleManager roleManager = userContext.getSystemService(RoleManager.class); - return roleManager.getDefaultHoldersForTest(role.getName()); + RoleManager userRoleManager = userContext.getSystemService(RoleManager.class); + return userRoleManager.getDefaultHoldersForTest(role.getName()); } else { return null; } @@ -49,8 +49,8 @@ public class ReservedForTestingProfileGroupExclusivityRoleBehavior implements Ro @NonNull Context context) { if (RoleFlags.isProfileGroupExclusivityAvailable()) { Context userContext = UserUtils.getUserContext(context, user); - RoleManager roleManager = userContext.getSystemService(RoleManager.class); - return roleManager.isRoleVisibleForTest(role.getName()); + RoleManager userRoleManager = userContext.getSystemService(RoleManager.class); + return userRoleManager.isRoleVisibleForTest(role.getName()); } else { return false; } -- cgit v1.2.3-59-g8ed1b