summaryrefslogtreecommitdiff
path: root/PermissionController/role-controller/java
diff options
context:
space:
mode:
author Richard MacGregor <rmacgregor@google.com> 2024-12-17 15:17:07 -0800
committer Richard MacGregor <rmacgregor@google.com> 2024-12-20 19:00:03 -0800
commitecbca45fbeec49dcd0c0f805cd3de43641d3a54f (patch)
treec76a4d71b3b7b13fc8b34d2dbf203808df2325a4 /PermissionController/role-controller/java
parentc2ca640029c2888f42fcba1be218691cce303be4 (diff)
Fix selecting none default app
Fix selection of "none" default apps when the current active user for a profile group exclusive role is not the primary user LOW_COVERAGE_REASON=FLAG_NOT_ENABLED Bug: 382688491 Flag: com.android.permission.flags.cross_user_role_enabled Relnote: N/A Test: atest RoleManagerTest Test: atest RoleManagerMultiUserTest Change-Id: Id362c17ac9ae937228667f3617eb937d97d90111
Diffstat (limited to 'PermissionController/role-controller/java')
-rw-r--r--PermissionController/role-controller/java/com/android/role/controller/model/Role.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/Role.java b/PermissionController/role-controller/java/com/android/role/controller/model/Role.java
index 118cb25a1..c09cb197d 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/model/Role.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/model/Role.java
@@ -1086,6 +1086,11 @@ public class Role {
*/
public void onNoneHolderSelectedAsUser(@NonNull UserHandle user, @NonNull Context context) {
RoleManagerCompat.setRoleFallbackEnabledAsUser(this, false, user, context);
+ if (RoleFlags.isProfileGroupExclusivityAvailable()
+ && getExclusivity() == Role.EXCLUSIVITY_PROFILE_GROUP) {
+ RoleManager roleManager = context.getSystemService(RoleManager.class);
+ roleManager.setActiveUserForRole(mName, user, 0);
+ }
}
/**