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

Commit 069b2ecd authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Respect RESTRICTION_REVOKED in PermissionFlags.isAppOpGranted()" into main

parents 053fd082 a9d3572c

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

+2 −1
Original line number Diff line number Diff line
@@ -347,7 +347,8 @@ object PermissionFlags { 
    }



    fun isAppOpGranted(flags: Int): Boolean =

        isPermissionGranted(flags) && !flags.hasBits(APP_OP_REVOKED)

        isPermissionGranted(flags) && !flags.hasBits(RESTRICTION_REVOKED) &&

            !flags.hasBits(APP_OP_REVOKED)



    fun toApiFlags(flags: Int): Int {

        var apiFlags = 0