summaryrefslogtreecommitdiff
path: root/services/permission/java
diff options
context:
space:
mode:
author Hai Zhang <zhanghai@google.com> 2023-02-04 00:44:42 +0000
committer Hai Zhang <zhanghai@google.com> 2023-02-04 00:45:07 +0000
commit1d508c8155bebf525ff67ad11bd2c1f29560e7a3 (patch)
tree05e99b2fe70d1e62ef6a271dccd30fb69e50461f /services/permission/java
parent9dd6ebe450a865d78f1d56dca1359177209cecf8 (diff)
Fix apexModuleName in getPrivilegedPermissionAllowlistState().
Bug: 266163702 Change-Id: I6e682afb36d29aa649bad5c23a4c06d6f20642c4 Test: presubmit
Diffstat (limited to 'services/permission/java')
-rw-r--r--services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt5
1 files changed, 1 insertions, 4 deletions
diff --git a/services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt b/services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt
index 02da25de20f1..a53aeb8388ae 100644
--- a/services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt
+++ b/services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt
@@ -1001,10 +1001,7 @@ class UidPermissionPolicy : SchemePolicy() {
permissionName: String
): Boolean? {
val permissionAllowlist = newState.systemState.permissionAllowlist
- val apexModuleName = permissionAllowlist.apexPrivilegedAppAllowlists
- .firstNotNullOfOrNullIndexed { _, apexModuleName, apexAllowlist ->
- if (packageState.apexModuleName in apexAllowlist) apexModuleName else null
- }
+ val apexModuleName = packageState.apexModuleName
val packageName = packageState.packageName
return when {
packageState.isVendor -> permissionAllowlist.getVendorPrivilegedAppAllowlistState(