Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix apexModuleName in getPrivilegedPermissionAllowlistState()."

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-04 02:39:31 +00:00
committed by Android (Google) Code Review
parent 02868bb811 1d508c8155
commit 33444bb81f
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt
View File

@@ -1003,10 +1003,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(