From ecbca45fbeec49dcd0c0f805cd3de43641d3a54f Mon Sep 17 00:00:00 2001 From: Richard MacGregor Date: Tue, 17 Dec 2024 15:17:07 -0800 Subject: 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 --- .../role-controller/java/com/android/role/controller/model/Role.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'PermissionController/role-controller/java') 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); + } } /** -- cgit v1.2.3-59-g8ed1b