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

Commit 0874d73f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename checkPrivilegedPermissionAllowlist()" into main

parents fce9512b 9263f255

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

+11 −2
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ class AppIdPermissionPolicy : SchemePolicy() { 
                    val mayGrantByPrivileged =

                        !permission.isPrivileged ||

                            requestingPackageStates.anyIndexed { _, it ->

                                checkPrivilegedPermissionAllowlist(it, permission)

                                checkPrivilegedPermissionAllowlistIfNeeded(it, permission)

                            }

                    val shouldGrantBySignature =

                        permission.isSignature &&
@@ -1280,7 +1280,16 @@ class AppIdPermissionPolicy : SchemePolicy() { 
        }

    }



    private fun MutateStateScope.checkPrivilegedPermissionAllowlist(

    /**

     * We only check privileged permission allowlist for system privileged apps. Hence, for platform

     * or for normal apps, we return true to indicate that we don't need to check the allowlist and

     * will let follow-up checks to decide whether we should grant the permission.

     *

     * @return `true`, if the permission is allowlisted for system privileged apps, or if we

     *         don't need to check the allowlist (for platform or for normal apps).

     *         `false`, if the permission is not allowlisted for system privileged apps.

     */

    private fun MutateStateScope.checkPrivilegedPermissionAllowlistIfNeeded(

        packageState: PackageState,

        permission: Permission

    ): Boolean {