diff options
| author | 2023-02-04 02:39:31 +0000 | |
|---|---|---|
| committer | 2023-02-04 02:39:31 +0000 | |
| commit | 33444bb81ff1f581a85aead118e86f0d35cf4ff0 (patch) | |
| tree | 00c886b47feffc8d043e58266f9cfc1d5cca5593 /services/permission/java | |
| parent | 02868bb811e4fed6abef36dd20abef2e5e556859 (diff) | |
| parent | 1d508c8155bebf525ff67ad11bd2c1f29560e7a3 (diff) | |
Merge "Fix apexModuleName in getPrivilegedPermissionAllowlistState()."
Diffstat (limited to 'services/permission/java')
| -rw-r--r-- | services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt | 5 |
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 cd60d1b06f7f..59551a3bbce3 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 @@ -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( |