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

Commit 1d508c81 authored by Hai Zhang's avatar Hai Zhang
Browse files

Fix apexModuleName in getPrivilegedPermissionAllowlistState(). 

Bug: 266163702
Change-Id: I6e682afb36d29aa649bad5c23a4c06d6f20642c4
Test: presubmit
parent 9dd6ebe4

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

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