Merge "Reenable fallback for parent profile" into main

2 files changed, 93 insertions, 1 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 6a7251563..0f79b19c0 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
@@ -992,7 +992,14 @@ public class Role {
      */
     public void onHolderAddedAsUser(@NonNull String packageName, @NonNull UserHandle user,
             @NonNull Context context) {
-        RoleManagerCompat.setRoleFallbackEnabledAsUser(this, true, user, context);
+        if (RoleFlags.isProfileGroupExclusivityAvailable()
+                && com.android.permission.flags.Flags.crossUserRoleUxBugfixEnabled()
+                && getExclusivity() == Role.EXCLUSIVITY_PROFILE_GROUP) {
+            UserHandle profileParent = UserUtils.getProfileParentOrSelf(user, context);
+            RoleManagerCompat.setRoleFallbackEnabledAsUser(this, true, profileParent, context);
+        } else {
+            RoleManagerCompat.setRoleFallbackEnabledAsUser(this, true, user, context);
+        }
     }
 
     /**
diff --git a/tests/cts/rolemultiuser/src/android/app/rolemultiuser/cts/RoleManagerMultiUserTest.kt b/tests/cts/rolemultiuser/src/android/app/rolemultiuser/cts/RoleManagerMultiUserTest.kt
index dc2ba42c6..3e24d5025 100644
--- a/tests/cts/rolemultiuser/src/android/app/rolemultiuser/cts/RoleManagerMultiUserTest.kt
+++ b/tests/cts/rolemultiuser/src/android/app/rolemultiuser/cts/RoleManagerMultiUserTest.kt
@@ -481,6 +481,47 @@ class RoleManagerMultiUserTest {
         assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser)
     }
 
+    @RequireFlagsEnabled(
+        com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED,
+        com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED,
+    )
+    @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS)
+    @EnsureHasWorkProfile
+    @RequireRunOnPrimaryUser
+    @Test
+    @Throws(java.lang.Exception::class)
+    fun addRoleHolderAsUserReenablesFallbackOnProfileParent() {
+        // Set other user as active
+        val initialUserReference = deviceState.initialUser()
+        val initialUser = initialUserReference.userHandle()
+        roleManager.setActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, initialUser, 0)
+        assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME))
+            .isEqualTo(initialUser)
+
+        val profileParentRoleManager = getRoleManagerForUser(initialUserReference)
+        profileParentRoleManager.setRoleFallbackEnabled(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, false)
+        assertThat(
+                profileParentRoleManager.isRoleFallbackEnabled(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)
+            )
+            .isFalse()
+
+        val targetActiveUser = deviceState.workProfile().userHandle()
+        val future = CallbackFuture()
+        roleManager.addRoleHolderAsUser(
+            PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME,
+            APP_PACKAGE_NAME,
+            0,
+            targetActiveUser,
+            context.mainExecutor,
+            future,
+        )
+        assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue()
+        assertThat(
+                profileParentRoleManager.isRoleFallbackEnabled(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)
+            )
+            .isTrue()
+    }
+
     @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED)
     @EnsureHasPermission(MANAGE_DEFAULT_APPLICATIONS)
     @EnsureDoesNotHavePermission(INTERACT_ACROSS_USERS_FULL)
@@ -575,6 +616,50 @@ class RoleManagerMultiUserTest {
         eventually { assertExpectedProfileHasRoleUsingGetDefaultApplication(targetActiveUser) }
     }
 
+    @RequireFlagsEnabled(
+        com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED,
+        com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED,
+    )
+    @EnsureHasPermission(
+        INTERACT_ACROSS_USERS_FULL,
+        MANAGE_DEFAULT_APPLICATIONS,
+        MANAGE_ROLE_HOLDERS,
+    )
+    @EnsureHasWorkProfile
+    @RequireRunOnPrimaryUser
+    @Test
+    @Throws(java.lang.Exception::class)
+    fun setDefaultApplicationReenablesFallbackOnProfileParent() {
+        // Set other user as active
+        val initialUserReference = deviceState.initialUser()
+        val initialUser = initialUserReference.userHandle()
+        roleManager.setActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, initialUser, 0)
+        assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME))
+            .isEqualTo(initialUser)
+
+        val profileParentRoleManager = getRoleManagerForUser(initialUserReference)
+        profileParentRoleManager.setRoleFallbackEnabled(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, false)
+        assertThat(
+                profileParentRoleManager.isRoleFallbackEnabled(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)
+            )
+            .isFalse()
+
+        val future = CallbackFuture()
+        getRoleManagerForUser(deviceState.workProfile())
+            .setDefaultApplication(
+                PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME,
+                APP_PACKAGE_NAME,
+                0,
+                context.mainExecutor,
+                future,
+            )
+        assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue()
+        assertThat(
+                profileParentRoleManager.isRoleFallbackEnabled(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)
+            )
+            .isTrue()
+    }
+
     @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED)
     @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS)
     @EnsureCanAddUser