summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hai Zhang <zhanghai@google.com> 2023-11-09 02:39:41 +0000
committer Hai Zhang <zhanghai@google.com> 2023-11-09 02:39:42 +0000
commit9fd5d1a9bb3fc88a547aad488a28d6d896ab5dd1 (patch)
tree594519ca556d3c1b6a985e58c9a0e586c15d9b46
parent47e5df6298706969ea93b04315a955f55b09fb2d (diff)
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 Signed-off-by: Joseph Gates <jgates@squareup.com>
-rw-r--r--PermissionController/role-controller/java/com/android/role/controller/model/Role.java2
1 files changed, 1 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 536bcc912..e80ea1194 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
@@ -453,7 +453,7 @@ public class Role {
} else {
List<String> packageNames = new ArrayList<>();
for (String defaultHolder : defaultHolders.split(DEFAULT_HOLDER_SEPARATOR)) {
- String packageName = getQualifiedDefaultHolderPackageNameAsUser(defaultHolders,
+ String packageName = getQualifiedDefaultHolderPackageNameAsUser(defaultHolder,
user, context);
if (packageName != null) {
packageNames.add(packageName);