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-10 22:32:24 +0000
commitc5d93d334ada412f06a2c7342eadc56c5239501b (patch)
tree23fe0dca12ac04a2bd6b4486575096cdce0c7497
parent0ffe59d0192e948ee514381b673ad3b098e6acc7 (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 Relnote: Fixed resolving multiple default holders for non-exclusive roles. Change-Id: Idd986b1c49c0be5ae5f060fe436d95e5de2c01f7 Merged-In: Idd986b1c49c0be5ae5f060fe436d95e5de2c01f7 Signed-off-by: Joseph Gates <jgates@squareup.com> (cherry picked from commit 9fd5d1a9bb3fc88a547aad488a28d6d896ab5dd1)
-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 aa6cba169..9ff16db0f 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 @@ public class Role {
} 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);
}