Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33444bb8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix apexModuleName in getPrivilegedPermissionAllowlistState()."

parents 02868bb8 1d508c81

services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt

+1 −4
Original line number Diff line number Diff line
@@ -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(