commit 7f2b88c8bd7ee8612d3d1c44561051b9d544311a
author Joseph Gates <jgates@squareup.com> Wed Nov 08 16:48:14 2023 -0800
committer Hai Zhang <zhanghai@google.com> Thu Nov 09 02:39:51 2023 +0000
tree 51097cbb8ff5303afaea918f305ceaffdd63e603
parent 1c4c5f499a3e7ad2eafc688ce447757238404e4a

Role: Fix resolving non-exclusive default holders

A role's default holders can be defined as a list with semicolon
separators. This commit fixes a bug where the non-split string of
default holders was used with non-exclusive roles, causing a failure of
the type:

Cannot get ApplicationInfo for default holder: com.packA;com.packB

Test: build

Change-Id: Idd986b1c49c0be5ae5f060fe436d95e5de2c01f7
Merged-In: Idd986b1c49c0be5ae5f060fe436d95e5de2c01f7
Signed-off-by: Joseph Gates <jgates@squareup.com>

PermissionController/role-controller/java/com/android/role/controller/model/Role.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 aa6cba1..9ff16db 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
@@ -462,7 +462,7 @@
         } else {
             List<String> packageNames = new ArrayList<>();
             for (String defaultHolder : defaultHolders.split(DEFAULT_HOLDER_SEPARATOR)) {
-                String packageName = getQualifiedDefaultHolderPackageName(defaultHolders, context);
+                String packageName = getQualifiedDefaultHolderPackageName(defaultHolder, context);
                 if (packageName != null) {
                     packageNames.add(packageName);
                 }