Merge "[Role Logic Move] Fix user-aware call in RetailDemoRoleBehavior" into main

1 files changed, 4 insertions, 2 deletions

diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/RetailDemoRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/RetailDemoRoleBehavior.java
index f2e3aaf01..6dcdafd4c 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/RetailDemoRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/RetailDemoRoleBehavior.java
@@ -57,7 +57,9 @@ public class RetailDemoRoleBehavior implements RoleBehavior {
     @Override
     public boolean isAvailableAsUser(@NonNull Role role, @NonNull UserHandle user,
             @NonNull Context context) {
-        UserManager userManager = context.getSystemService(UserManager.class);
-        return userManager.isSystemUser() || userManager.isMainUser() || userManager.isDemoUser();
+        Context userContext = UserUtils.getUserContext(context, user);
+        UserManager userUserManager = userContext.getSystemService(UserManager.class);
+        return userUserManager.isSystemUser() || userUserManager.isMainUser()
+                || userUserManager.isDemoUser();
     }
 }