2 files changed, 9 insertions, 5 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 6c7eb7d9e..31216f72d 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
@@ -416,10 +416,14 @@ public class Role {
     @NonNull
     public List<String> getDefaultHoldersAsUser(@NonNull UserHandle user,
             @NonNull Context context) {
-        if (mDefaultHoldersResourceName == null) {
-            if (mBehavior != null) {
-                return mBehavior.getDefaultHoldersAsUser(this, user, context);
+        if (mBehavior != null) {
+            List<String> defaultHolders = mBehavior.getDefaultHoldersAsUser(this, user, context);
+            if (defaultHolders != null) {
+                return defaultHolders;
             }
+        }
+
+        if (mDefaultHoldersResourceName == null) {
             return Collections.emptyList();
         }
 
diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/RoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/model/RoleBehavior.java
index 4bc1873d5..3849a50e3 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/model/RoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/model/RoleBehavior.java
@@ -48,10 +48,10 @@ public interface RoleBehavior {
     /**
      * @see Role#getDefaultHolders(Context)
      */
-    @NonNull
+    @Nullable
     default List<String> getDefaultHoldersAsUser(@NonNull Role role, @NonNull UserHandle user,
             @NonNull Context context) {
-        return Collections.emptyList();
+        return null;
     }
 
     /**